SerenityOS/serenity
1
0 Fork 0
mirror of https://github.com/SerenityOS/serenity.git synced 2026-11-07 04:29:30 -10:00
Code Issues Packages Projects Releases Wiki Activity

LibGfx: Fix title bar text clipping in Redmond Glass/Plastic

Browse Source 
Previously, the title bar text could be painted under the buttons for
small window sizes (or long titles).
This commit is contained in:
MacDue authored and Nico Weber committed 2025-01-06 20:20:19 -05:00
1 parent fac74f51a3
commit 18cb48ae99
2 files changed
+2 -3
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Userland/Libraries/LibGfx/GlassWindowTheme.cpp
+1 -1
View File
@@ -72,7 +72,6 @@ void GlassWindowTheme::paint_normal_frame(Painter& painter, WindowState window_s
(void)window_state;
(void)icon;
(void)window_modified;
(void)leftmost_button_rect;
auto frame_rect = frame_rect_for_window(WindowType::Normal, window_mode, window_rect, palette, menu_row_count);
auto relative_window_location = window_rect.location() - frame_rect.location();
@@ -93,6 +92,7 @@ void GlassWindowTheme::paint_normal_frame(Painter& painter, WindowState window_s
titlebar_rect.set_height(titlebar_rect.height() + palette.window_border_thickness() + 1);
auto& title_font = FontDatabase::window_title_font();
auto clipped_title_rect = titlebar_rect.translated(7, 0);
clipped_title_rect.set_width(leftmost_button_rect.left() - clipped_title_rect.x());
if (!clipped_title_rect.is_empty()) {
auto title_alignment = palette.title_alignment();
painter.draw_text(clipped_title_rect.translated(1, 2), window_title, title_font, title_alignment, Color(15, 16, 137), Gfx::TextElision::Right);
Userland/Libraries/LibGfx/PlasticWindowTheme.cpp
+1 -2
View File
@@ -122,10 +122,8 @@ static void paint_window_frame(IntRect rect, Painter& painter, Palette const& pa
void PlasticWindowTheme::paint_normal_frame(Painter& painter, WindowState window_state, WindowMode window_mode, IntRect const& window_rect, StringView window_title, Bitmap const& icon, Palette const& palette, IntRect const& leftmost_button_rect, int menu_row_count, bool window_modified) const
{
// FIXME: Handle these cases.
(void)window_state;
(void)icon;
(void)window_modified;
(void)leftmost_button_rect;
bool is_inactive = window_state == WindowState::Inactive;
auto const& frame_colors = is_inactive ? s_inactive_frame_colors : s_frame_colors;
@@ -142,6 +140,7 @@ void PlasticWindowTheme::paint_normal_frame(Painter& painter, WindowState window
auto& title_font = FontDatabase::window_title_font();
auto clipped_title_rect = titlebar_rect.translated(7, 0);
clipped_title_rect.set_width(leftmost_button_rect.left() - clipped_title_rect.x());
if (!clipped_title_rect.is_empty()) {
auto title_alignment = palette.title_alignment();
painter.draw_text(clipped_title_rect.translated(1, 2), window_title, title_font, title_alignment, Color(15, 16, 137), Gfx::TextElision::Right);