finally fixed it

tau-OS · Jan 24, 2023 · c0cb440 · c0cb440
1 parent 5f571e9
commit c0cb440
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 11 deletions.
diff --git a/lib/Models/Application.vala b/lib/Models/Application.vala
@@ -102,14 +102,14 @@ public class He.Application : Gtk.Application {
   private void update_accent_color() {
     He.Color.RGBColor rgb_color;
 
-    if (desktop.accent_color != null) {
-      rgb_color = He.Color.from_hex(desktop.accent_color);
-    } else {
+    if (desktop.accent_color == null) {
       if (default_accent_color != null) {
         rgb_color = default_accent_color;
       } else {
         rgb_color = Desktop.ColorScheme.DARK == desktop.prefers_color_scheme ? default_dark_accent : default_light_accent;
       }
+    } else {
+      rgb_color = desktop.accent_color;
     }
 
     var lch_color = He.Color.rgb_to_lch (rgb_color);

diff --git a/lib/Utils/Desktop.vala b/lib/Utils/Desktop.vala
@@ -105,8 +105,8 @@ public class He.Desktop : Object {
     /**
     * The accent color preference.
     */
-    private string? _accent_color;
-    public string? accent_color {
+    private He.Color.RGBColor? _accent_color;
+    public He.Color.RGBColor? accent_color {
         get {
             return _accent_color;
         }
@@ -126,12 +126,14 @@ public class He.Desktop : Object {
                 "accent-color"
             ).get_variant ();
 
-            if (accent.get_type().equal(VariantType.UINT32)) {
+            if (accent.get_string () == "#multi") {
                 accent_color = null;
                 return;
             }
-
-            accent_color = accent.get_string ();
+
+            string color = accent.get_string ();
+            accent_color = He.Color.from_hex(color);
+            return;
         } catch (Error e) {
             debug ("%s", e.message);
         }
@@ -142,12 +144,12 @@ public class He.Desktop : Object {
     private void init_handle_settings_change() {
         portal.setting_changed.connect ((scheme, key, val) => {
             if (scheme == "org.freedesktop.appearance" && key == "accent-color") {
-                if (val.get_type().equal(VariantType.UINT32)) {
+                if (val.get_string () == "#multi") {
                     accent_color = null;
-                    return;
                 }
 
-                accent_color = (string) val.get_string ();
+                string color = val.get_string ();
+                accent_color = He.Color.from_hex(color);
             }
 
             if (scheme == "org.freedesktop.appearance" && key == "dark-mode-strength") {