mirror of
https://github.com/RGBCube/serenity
synced 2025-07-26 06:37:35 +00:00
LibGfx: Make Rect::align_within() correct for TopCenter and BottomCenter
Also update the LibGfxDemo to actually show off these alignments.
This commit is contained in:
parent
f63ecc2763
commit
c55739bbc0
2 changed files with 5 additions and 2 deletions
|
@ -139,9 +139,11 @@ void Canvas::draw()
|
|||
painter.draw_text(Gfx::IntRect { 520, 260, 240, 80 }, "Center"sv, Gfx::TextAlignment::Center, Color::White);
|
||||
painter.draw_text(Gfx::IntRect { 520, 260, 240, 80 }, "CenterRight"sv, Gfx::TextAlignment::CenterRight, Color::White);
|
||||
painter.draw_text(Gfx::IntRect { 520, 260, 240, 80 }, "TopLeft"sv, Gfx::TextAlignment::TopLeft, Color::White);
|
||||
painter.draw_text(Gfx::IntRect { 520, 260, 240, 80 }, "TopCenter"sv, Gfx::TextAlignment::TopCenter, Color::White);
|
||||
painter.draw_text(Gfx::IntRect { 520, 260, 240, 80 }, "TopRight"sv, Gfx::TextAlignment::TopRight, Color::White);
|
||||
painter.draw_text(Gfx::IntRect { 520, 260, 240, 80 }, "BottomLeft"sv, Gfx::TextAlignment::BottomLeft, Color::White);
|
||||
painter.draw_text(Gfx::IntRect { 520, 260, 240, 80 }, "BottomRight"sv, Gfx::TextAlignment::BottomRight, Color::White);
|
||||
painter.draw_text(Gfx::IntRect { 520, 260, 240, 80 }, "BottomCenter"sv, Gfx::TextAlignment::BottomCenter, Color::White);
|
||||
|
||||
painter.draw_rect({ 520, 360, 240, 30 }, Color::DarkGray);
|
||||
painter.draw_text(Gfx::IntRect { 520, 360, 240, 30 }, "Emojis! 🙂😂🐞🦄"sv, Gfx::TextAlignment::Center, Color::White);
|
||||
|
|
|
@ -898,7 +898,8 @@ public:
|
|||
center_within(other);
|
||||
return;
|
||||
case TextAlignment::TopCenter:
|
||||
set_x(other.x() + other.width() / 2);
|
||||
center_horizontally_within(other);
|
||||
set_y(other.y());
|
||||
return;
|
||||
case TextAlignment::TopLeft:
|
||||
set_location(other.location());
|
||||
|
@ -916,7 +917,7 @@ public:
|
|||
center_vertically_within(other);
|
||||
return;
|
||||
case TextAlignment::BottomCenter:
|
||||
set_x(other.x() + other.width() / 2);
|
||||
center_horizontally_within(other);
|
||||
set_y(other.y() + other.height() - height());
|
||||
return;
|
||||
case TextAlignment::BottomLeft:
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue