From c110e1db971d6f62814663572032dcd11b2bf2c6 Mon Sep 17 00:00:00 2001
From: Ryo Nakano <ryonakaknock3@gmail.com>
Date: Sun, 11 Aug 2024 19:15:14 +0900
Subject: [PATCH] refactor: Bind color preference (#77)

Also move to Application class because this is application-wide settings and not only for the MainWindow
---
 src/Application.vala | 22 ++++++++++++++++++++++
 src/MainWindow.vala  | 10 ----------
 2 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/src/Application.vala b/src/Application.vala
index 17c2575..e1c152b 100644
--- a/src/Application.vala
+++ b/src/Application.vala
@@ -42,6 +42,28 @@ public class Application : Gtk.Application {
         set_accels_for_action ("app.quit", { "<Control>q", "Escape" });
     }
 
+    /**
+     * Follow elementary OS-wide dark preference
+     */
+    private void setup_style () {
+        var granite_settings = Granite.Settings.get_default ();
+        var gtk_settings = Gtk.Settings.get_default ();
+
+        granite_settings.bind_property ("prefers-color-scheme", gtk_settings, "gtk-application-prefer-dark-theme",
+            BindingFlags.DEFAULT | BindingFlags.SYNC_CREATE,
+            ((binding, granite_prop, ref gtk_prop) => {
+                gtk_prop.set_boolean ((Granite.Settings.ColorScheme) granite_prop == Granite.Settings.ColorScheme.DARK);
+                return true;
+            })
+        );
+    }
+
+    protected override void startup () {
+        base.startup ();
+
+        setup_style ();
+    }
+
     protected override void activate () {
         if (window != null) {
             return;
diff --git a/src/MainWindow.vala b/src/MainWindow.vala
index 8cd049c..ca3dc9a 100644
--- a/src/MainWindow.vala
+++ b/src/MainWindow.vala
@@ -78,16 +78,6 @@ public class MainWindow : Gtk.ApplicationWindow {
             // See https://gitlab.gnome.org/GNOME/gtk/-/issues/1874#note_509304
             update_label_text.begin (magnified_label);
         });
-
-        // Follow elementary OS-wide dark preference
-        var granite_settings = Granite.Settings.get_default ();
-        var gtk_settings = Gtk.Settings.get_default ();
-
-        gtk_settings.gtk_application_prefer_dark_theme = granite_settings.prefers_color_scheme == Granite.Settings.ColorScheme.DARK;
-
-        granite_settings.notify["prefers-color-scheme"].connect (() => {
-            gtk_settings.gtk_application_prefer_dark_theme = granite_settings.prefers_color_scheme == Granite.Settings.ColorScheme.DARK;
-        });
     }
 
     private async void update_label_text (Gtk.Label label_widget) {