RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-23 15:45:06 +00:00
Code Issues Activity Actions

WindowServer: Don't highlight disabled menu items when hovered

Browse source
This commit is contained in:
Andreas Kling 2019-08-27 10:20:10 +02:00
parent ed0553fe10
commit d3c21163a5
1 changed files with 3 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Servers/WindowServer/WSMenu.cpp
View file

@ -137,15 +137,12 @@ void WSMenu::draw()
for (auto& item : m_items) { for (auto& item : m_items) {
if (item.type() == WSMenuItem::Text) { if (item.type() == WSMenuItem::Text) {
Color text_color = Color::Black; 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.fill_rect(item.rect(), Color::from_rgb(0xad714f));
painter.draw_rect(item.rect(), Color::from_rgb(0x793016)); painter.draw_rect(item.rect(), Color::from_rgb(0x793016));
text_color = Color::White; text_color = Color::White;
if (!item.is_enabled()) } else if (!item.is_enabled()) {
text_color = Color::from_rgb(0xb5a195); text_color = Color::MidGray;
} else {
if (!item.is_enabled())
text_color = Color::MidGray;
} }
Rect text_rect = item.rect().translated(stripe_rect.width() + 6, 0); Rect text_rect = item.rect().translated(stripe_rect.width() + 6, 0);
if (item.is_checkable()) { if (item.is_checkable()) {