RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-06-01 07:48:12 +00:00
Code Issues Activity Actions

LibGfx: Add support for TextAlignment::TopCenter / BottomCenter

Browse source 
Now supports TextAlignment::TopCenter and TextAlignment::BottomCenter
for the Painter::draw_text.

Also patched this in Spreadsheet/CellTypeDialog.cpp
This commit is contained in:
Vrins 2022-02-27 01:33:48 +01:00 • committed by Andreas Kling
parent 73ade62d4f
commit 3b22fd9a9f
5 changed files with 33 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Userland/Libraries/LibGfx/Rect.cpp
View file

@ -132,9 +132,15 @@ Rect<T> Rect<T>::aligned_within(Size<T> const& rect_size, Point<T> const& align_
Rect<T> rect;
switch (alignment) {
case TextAlignment::TopCenter:
rect = { { align_at.x() - rect_size.width() / 2, align_at.y() }, rect_size };
break;
case TextAlignment::TopLeft:
rect = { align_at, rect_size };
break;
case TextAlignment::TopRight:
rect = { { align_at.x() - rect_size.width(), align_at.y() }, rect_size };
break;
case TextAlignment::CenterLeft:
rect = { { align_at.x(), align_at.y() - rect_size.height() / 2 }, rect_size };
break;
@ -144,8 +150,8 @@ Rect<T> Rect<T>::aligned_within(Size<T> const& rect_size, Point<T> const& align_
case TextAlignment::CenterRight:
rect = { { align_at.x() - rect_size.width() / 2, align_at.y() }, rect_size };
break;
case TextAlignment::TopRight:
rect = { { align_at.x() - rect_size.width(), align_at.y() }, rect_size };
case TextAlignment::BottomCenter:
rect = { { align_at.x() - rect_size.width() / 2, align_at.y() - rect_size.width() }, rect_size };
break;
case TextAlignment::BottomLeft:
rect = { { align_at.x(), align_at.y() - rect_size.width() }, rect_size };
@ -270,6 +276,9 @@ void Rect<T>::align_within(Rect<T> const& other, TextAlignment alignment)
case TextAlignment::Center:
center_within(other);
return;
case TextAlignment::TopCenter:
set_x(other.x() + other.width() / 2);
return;
case TextAlignment::TopLeft:
set_location(other.location());
return;
@ -285,6 +294,10 @@ void Rect<T>::align_within(Rect<T> const& other, TextAlignment alignment)
set_x(other.x() + other.width() - width());
center_vertically_within(other);
return;
case TextAlignment::BottomCenter:
set_x(other.x() + other.width() / 2);
set_y(other.y() + other.height() - height());
return;
case TextAlignment::BottomLeft:
set_x(other.x());
set_y(other.y() + other.height() - height());