From 05cc7d69ac55d8588fb4b0c599d5d8dc332de1be Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Thu, 25 Mar 2021 21:10:49 +0100 Subject: [PATCH] WindowServer: Tweak the look of menus Paint menus with a flatter outline instead of giving them the regular window border. --- Userland/Services/WindowServer/Menu.cpp | 7 +++---- Userland/Services/WindowServer/Menu.h | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Userland/Services/WindowServer/Menu.cpp b/Userland/Services/WindowServer/Menu.cpp index 0096571b2f..9307f7b2b0 100644 --- a/Userland/Services/WindowServer/Menu.cpp +++ b/Userland/Services/WindowServer/Menu.cpp @@ -100,7 +100,7 @@ static const int s_checked_bitmap_height = 9; static const int s_submenu_arrow_bitmap_width = 9; static const int s_submenu_arrow_bitmap_height = 9; static const int s_item_icon_width = 16; -static const int s_stripe_width = 23; +static const int s_stripe_width = 24; int Menu::content_width() const { @@ -187,8 +187,8 @@ void Menu::draw() Gfx::Painter painter(*menu_window()->backing_store()); Gfx::IntRect rect { {}, menu_window()->size() }; - Gfx::StylePainter::paint_window_frame(painter, rect, palette); - painter.fill_rect(rect.shrunken(6, 6), palette.menu_base()); + painter.draw_rect(rect, Color::Black); + painter.fill_rect(rect.shrunken(2, 2), palette.menu_base()); int width = this->content_width(); if (!s_checked_bitmap) @@ -203,7 +203,6 @@ void Menu::draw() Gfx::IntRect stripe_rect { frame_thickness(), frame_thickness(), s_stripe_width, menu_window()->height() - frame_thickness() * 2 }; painter.fill_rect(stripe_rect, palette.menu_stripe()); - painter.draw_line(stripe_rect.top_right(), stripe_rect.bottom_right(), palette.menu_stripe().darkened()); int visible_item_count = this->visible_item_count(); diff --git a/Userland/Services/WindowServer/Menu.h b/Userland/Services/WindowServer/Menu.h index 670c412f5b..d23a1e6907 100644 --- a/Userland/Services/WindowServer/Menu.h +++ b/Userland/Services/WindowServer/Menu.h @@ -96,8 +96,8 @@ public: int content_width() const; - int item_height() const { return 20; } - int frame_thickness() const { return 3; } + int item_height() const { return 22; } + int frame_thickness() const { return 2; } int horizontal_padding() const { return left_padding() + right_padding(); } int left_padding() const { return 14; } int right_padding() const { return 14; }