From ef7fbbcf70ff1ebd6bb839fd287a564418b57746 Mon Sep 17 00:00:00 2001 From: networkException Date: Thu, 16 Jun 2022 20:28:39 +0200 Subject: [PATCH] Taskbar: Handle an override theme being active This patch makes taskbar react to an override theme being set by not having any theme in the menu selected. --- Userland/Services/Taskbar/main.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Userland/Services/Taskbar/main.cpp b/Userland/Services/Taskbar/main.cpp index 2fcc93ade0..7988c8f2ea 100644 --- a/Userland/Services/Taskbar/main.cpp +++ b/Userland/Services/Taskbar/main.cpp @@ -247,9 +247,10 @@ ErrorOr> build_system_menu(WindowRefence& window_ref) if (g_themes_menu->is_visible()) return; auto current_theme_name = GUI::ConnectionToWindowServer::the().get_system_theme(); + auto theme_overridden = GUI::ConnectionToWindowServer::the().is_system_theme_overridden(); for (size_t index = 0; index < g_themes.size(); ++index) { auto* action = g_themes_menu->action_at(index); - action->set_checked(action->text() == current_theme_name); + action->set_checked(!theme_overridden && action->text() == current_theme_name); } };