Fix menu coloring

Author: leolost2605

background/Application.vala

@@ -17,6 +17,14 @@ public class Gala.Background.Application : Gtk.Application {
 
         hold ();
 
+        /*
+         * We can't use Granite for the color scheme since it connects to the portal which only becomes available
+         * some time after we are already showing.
+         */
+        Utils.init_color_scheme_watcher ((scheme) => {
+            Gtk.Settings.get_default ().gtk_application_prefer_dark_theme = scheme == DARK;
+        });
+
         /*
          * We have to be careful not to init Granite because Granite gets Settings sync but it takes a while
          * until the portal launches so it blocks.

background/BackgroundManager.vala

@@ -18,18 +18,14 @@ public class Gala.Background.BackgroundManager : Object {
     private uint idle_id = 0;
 
     construct {
-        /*
-         * We can't use Granite for the color scheme since it connects to the portal which only becomes available
-         * some time after we are already showing.
-         */
-        Utils.init_color_scheme_watcher (queue_set_background);
-
         setup_background ();
         Gdk.Display.get_default ().get_monitors ().items_changed.connect (setup_background);
 
         set_background ();
         gnome_settings.changed.connect (queue_set_background);
         elementary_settings.changed.connect (queue_set_background);
+
+        Gtk.Settings.get_default ().notify["gtk-application-prefer-dark-theme"].connect (queue_set_background);
     }
 
     private void setup_background () {
@@ -75,7 +71,7 @@ public class Gala.Background.BackgroundManager : Object {
         }
 
         if (elementary_settings.get_boolean ("dim-wallpaper-in-dark-style")
-            && Utils.get_color_scheme () == DARK
+            && Gtk.Settings.get_default ().gtk_application_prefer_dark_theme
         ) {
             current_background = Background.get_dimmed (current_background);
         }

background/Utils.vala

@@ -20,7 +20,6 @@ namespace Gala.Background.Utils {
     [DBus (name = "io.elementary.pantheon.AccountsService")]
     private interface AccountsService : DBusProxy {
         public abstract int prefers_color_scheme { get; set; }
-        public abstract int prefers_accent_color { get; set; }
     }
 
     private const string FDO_ACCOUNTS_NAME = "org.freedesktop.Accounts";
@@ -40,6 +39,8 @@ namespace Gala.Background.Utils {
             return;
         }
 
+        style_change_callback (accounts_service_proxy.prefers_color_scheme);
+
         accounts_service_proxy.g_properties_changed.connect ((changed, invalid) => {
             var value = changed.lookup_value ("PrefersColorScheme", new VariantType ("i"));
             if (value != null) {
@@ -48,14 +49,6 @@ namespace Gala.Background.Utils {
         });
     }
 
-    public static ColorScheme get_color_scheme () {
-        if (accounts_service_proxy != null) {
-            return accounts_service_proxy.prefers_color_scheme;
-        }
-
-        return LIGHT;
-    }
-
     private const double SATURATION_WEIGHT = 1.5;
     private const double WEIGHT_THRESHOLD = 1.0;