RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-28 21:17:44 +00:00
Code Issues Activity Actions

LibGfx+Userland: Add width_rounded_up() helper

Browse source
This commit is contained in:
thankyouverycool 2023-04-14 08:52:47 -04:00 • committed by Andreas Kling
parent c9404c3a63
commit 55423b4ed0
21 changed files with 34 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Userland/Libraries/LibGfx/Font/BitmapFont.cpp
View file

@ -336,6 +336,11 @@ float BitmapFont::glyph_or_emoji_width(Utf32CodePointIterator& it) const
return glyph_or_emoji_width_impl(*this, it);
}
int BitmapFont::width_rounded_up(StringView view) const
{
return static_cast<int>(ceilf(width(view)));
}
float BitmapFont::width(StringView view) const { return unicode_view_width(Utf8View(view)); }
float BitmapFont::width(Utf8View const& view) const { return unicode_view_width(view); }
float BitmapFont::width(Utf32View const& view) const { return unicode_view_width(view); }

2
Userland/Libraries/LibGfx/Font/BitmapFont.h
View file

@ -97,6 +97,8 @@ public:
virtual float width(Utf8View const&) const override;
virtual float width(Utf32View const&) const override;
virtual int width_rounded_up(StringView) const override;
DeprecatedString name() const override { return m_name; }
void set_name(DeprecatedString name) { m_name = move(name); }

2
Userland/Libraries/LibGfx/Font/Font.h
View file

@ -196,6 +196,8 @@ public:
virtual float width(Utf8View const&) const = 0;
virtual float width(Utf32View const&) const = 0;
virtual int width_rounded_up(StringView) const = 0;
virtual DeprecatedString name() const = 0;
virtual bool is_fixed_width() const = 0;

5
Userland/Libraries/LibGfx/Font/ScaledFont.cpp
View file

@ -36,6 +36,11 @@ ScaledFont::ScaledFont(NonnullRefPtr<VectorFont> font, float point_width, float
};
}
int ScaledFont::width_rounded_up(StringView view) const
{
return static_cast<int>(ceilf(width(view)));
}
float ScaledFont::width(StringView view) const { return unicode_view_width(Utf8View(view)); }
float ScaledFont::width(Utf8View const& view) const { return unicode_view_width(view); }
float ScaledFont::width(Utf32View const& view) const { return unicode_view_width(view); }

1
Userland/Libraries/LibGfx/Font/ScaledFont.h
View file

@ -61,6 +61,7 @@ public:
virtual float width(StringView) const override;
virtual float width(Utf8View const&) const override;
virtual float width(Utf32View const&) const override;
virtual int width_rounded_up(StringView) const override;
virtual DeprecatedString name() const override { return DeprecatedString::formatted("{} {}", family(), variant()); }
virtual bool is_fixed_width() const override { return m_font->is_fixed_width(); }
virtual u8 glyph_spacing() const override { return 0; }

2
Userland/Libraries/LibGfx/Painter.cpp
View file

@ -2453,7 +2453,7 @@ void Gfx::Painter::draw_ui_text(Gfx::IntRect const& rect, StringView text, Gfx::
Optional<size_t> underline_offset;
auto name_to_draw = parse_ampersand_string(text, &underline_offset);
Gfx::IntRect text_rect { 0, 0, static_cast<int>(ceilf(font.width(name_to_draw))), font.pixel_size_rounded_up() };
Gfx::IntRect text_rect { 0, 0, font.width_rounded_up(name_to_draw), font.pixel_size_rounded_up() };
text_rect.align_within(rect, text_alignment);
draw_text(text_rect, name_to_draw, font, text_alignment, color);