From fe47e664387d0fcc6ff35f3fb9fcf840aca10d1a Mon Sep 17 00:00:00 2001 From: Karol Kosek Date: Mon, 14 Mar 2022 18:00:43 +0100 Subject: [PATCH] WindowServer: Use font height for item heights in Menus The height of menu items was relatively small on larger fonts. --- Userland/Services/WindowServer/Menu.cpp | 5 +++++ Userland/Services/WindowServer/Menu.h | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Userland/Services/WindowServer/Menu.cpp b/Userland/Services/WindowServer/Menu.cpp index fae82b482b..7112cb0808 100644 --- a/Userland/Services/WindowServer/Menu.cpp +++ b/Userland/Services/WindowServer/Menu.cpp @@ -95,6 +95,11 @@ int Menu::content_width() const return max(widest_item, rect_in_window_menubar().width()) + horizontal_padding() + frame_thickness() * 2; } +int Menu::item_height() const +{ + return max(font().preferred_line_height(), s_item_icon_width + 2) + 4; +} + void Menu::redraw() { if (!menu_window()) diff --git a/Userland/Services/WindowServer/Menu.h b/Userland/Services/WindowServer/Menu.h index 806131d802..348b58436e 100644 --- a/Userland/Services/WindowServer/Menu.h +++ b/Userland/Services/WindowServer/Menu.h @@ -86,7 +86,7 @@ public: int content_width() const; - static constexpr int item_height() { return 22; } + int item_height() const; static constexpr int frame_thickness() { return 2; } static constexpr int horizontal_padding() { return left_padding() + right_padding(); } static constexpr int left_padding() { return 14; }