RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 11:57:35 +00:00
Code Issues Activity Actions

LibGfx: Make ClassicWindowTheme menubar heights respect the font size

Browse source
This commit is contained in:
Andreas Kling 2023-01-03 11:17:56 +01:00
parent bfa7381852
commit 268d661138
2 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Userland/Libraries/LibGfx/ClassicWindowTheme.cpp
View file

@ -14,7 +14,10 @@
namespace Gfx { namespace Gfx {
static constexpr int menubar_height = 20; int ClassicWindowTheme::menubar_height() const
{
return max(20, FontDatabase::default_font().pixel_size() + 6);
}
Gfx::IntRect ClassicWindowTheme::titlebar_icon_rect(WindowType window_type, WindowMode window_mode, IntRect const& window_rect, Palette const& palette) const Gfx::IntRect ClassicWindowTheme::titlebar_icon_rect(WindowType window_type, WindowMode window_mode, IntRect const& window_rect, Palette const& palette) const
{ {
@ -120,7 +123,7 @@ IntRect ClassicWindowTheme::menubar_rect(WindowType window_type, WindowMode wind
{ {
if (window_type != WindowType::Normal) if (window_type != WindowType::Normal)
return {}; return {};
return { palette.window_border_thickness(), palette.window_border_thickness() - 1 + titlebar_height(window_type, window_mode, palette) + 2, window_rect.width(), menubar_height * menu_row_count }; return { palette.window_border_thickness(), palette.window_border_thickness() - 1 + titlebar_height(window_type, window_mode, palette) + 2, window_rect.width(), menubar_height() * menu_row_count };
} }
IntRect ClassicWindowTheme::titlebar_rect(WindowType window_type, WindowMode window_mode, IntRect const& window_rect, Palette const& palette) const IntRect ClassicWindowTheme::titlebar_rect(WindowType window_type, WindowMode window_mode, IntRect const& window_rect, Palette const& palette) const
@ -180,9 +183,9 @@ IntRect ClassicWindowTheme::frame_rect_for_window(WindowType window_type, Window
case WindowType::Normal: case WindowType::Normal:
return { return {
window_rect.x() - border_thickness, window_rect.x() - border_thickness,
window_rect.y() - window_titlebar_height - border_thickness - 1 - menu_row_count * menubar_height, window_rect.y() - window_titlebar_height - border_thickness - 1 - menu_row_count * menubar_height(),
window_rect.width() + (border_thickness * 2), window_rect.width() + (border_thickness * 2),
window_rect.height() + (border_thickness * 2) + 1 + window_titlebar_height + menu_row_count * menubar_height window_rect.height() + (border_thickness * 2) + 1 + window_titlebar_height + menu_row_count * menubar_height(),
}; };
case WindowType::Notification: case WindowType::Notification:
return { return {

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

@ -37,6 +37,8 @@ public:
virtual float frame_alpha_hit_threshold(WindowState) const override { return 1.0f; } virtual float frame_alpha_hit_threshold(WindowState) const override { return 1.0f; }
private: private:
int menubar_height() const;
struct FrameColors { struct FrameColors {
Color title_color; Color title_color;
Color border_color; Color border_color;