Prechádzať zdrojové kódy

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.
networkException 3 rokov pred
rodič
commit
ef7fbbcf70
1 zmenil súbory, kde vykonal 2 pridanie a 1 odobranie
  1. 2 1
      Userland/Services/Taskbar/main.cpp

+ 2 - 1
Userland/Services/Taskbar/main.cpp

@@ -247,9 +247,10 @@ ErrorOr<NonnullRefPtr<GUI::Menu>> 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);
         }
     };