From d3c21163a52959bc73df6d4397f76b6a743aa48a Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Tue, 27 Aug 2019 10:20:10 +0200 Subject: [PATCH] WindowServer: Don't highlight disabled menu items when hovered --- Servers/WindowServer/WSMenu.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/Servers/WindowServer/WSMenu.cpp b/Servers/WindowServer/WSMenu.cpp index d0933947d1..4f3051aded 100644 --- a/Servers/WindowServer/WSMenu.cpp +++ b/Servers/WindowServer/WSMenu.cpp @@ -137,15 +137,12 @@ void WSMenu::draw() for (auto& item : m_items) { if (item.type() == WSMenuItem::Text) { Color text_color = Color::Black; - if (&item == m_hovered_item) { + if (&item == m_hovered_item && item.is_enabled()) { painter.fill_rect(item.rect(), Color::from_rgb(0xad714f)); painter.draw_rect(item.rect(), Color::from_rgb(0x793016)); text_color = Color::White; - if (!item.is_enabled()) - text_color = Color::from_rgb(0xb5a195); - } else { - if (!item.is_enabled()) - text_color = Color::MidGray; + } else if (!item.is_enabled()) { + text_color = Color::MidGray; } Rect text_rect = item.rect().translated(stripe_rect.width() + 6, 0); if (item.is_checkable()) {