RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-24 23:07:34 +00:00
Code Issues Activity Actions

Make a preparation pass for variable-width fonts.

Browse source
This commit is contained in:
Andreas Kling 2019-03-06 11:03:10 +01:00
parent b85fe0bd07
commit 0a86366c71
9 changed files with 72 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

12
SharedGraphics/Painter.cpp
View file

@ -332,21 +332,25 @@ void Painter::draw_text(const Rect& rect, const String& text, TextAlignment alig
} else if (alignment == TextAlignment::CenterLeft) {
point = { rect.x(), rect.center().y() - (font().glyph_height() / 2) };
} else if (alignment == TextAlignment::CenterRight) {
int text_width = text.length() * font().glyph_width();
int text_width = font().width(text);
point = { rect.right() - text_width, rect.center().y() - (font().glyph_height() / 2) };
} else if (alignment == TextAlignment::Center) {
int text_width = text.length() * font().glyph_width();
int text_width = font().width(text);
point = rect.center();
point.move_by(-(text_width / 2), -(font().glyph_height() / 2));
} else {
ASSERT_NOT_REACHED();
}
for (ssize_t i = 0; i < text.length(); ++i, point.move_by(font().glyph_width(), 0)) {
int space_width = font().glyph_width(' ');
for (ssize_t i = 0; i < text.length(); ++i) {
byte ch = text[i];
if (ch == ' ')
if (ch == ' ') {
point.move_by(space_width, 0);
continue;
}
draw_glyph(point, ch, color);
point.move_by(font().glyph_width(ch), 0);
}
}