Merge branch 'main' into context-menu

elementary · Nov 7, 2023 · 88ef8f1 · 88ef8f1
2 parents 5fe6179 + b5c18f6
commit 88ef8f1
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -19,7 +19,7 @@ jobs:
       image: ghcr.io/elementary/docker:${{ matrix.version }}
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Install Dependencies
       run: |
         apt update
@@ -37,6 +37,6 @@ jobs:
       image: valalang/lint
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Lint
       run: io.elementary.vala-lint -d .
diff --git a/src/Application.vala b/src/Application.vala
@@ -8,6 +8,19 @@ public class Dock.Application : Gtk.Application {
         Object (application_id: "io.elementary.dock");
     }
 
+    protected override void startup () {
+        base.startup ();
+
+        unowned var granite_settings = Granite.Settings.get_default ();
+        unowned var gtk_settings = Gtk.Settings.get_default ();
+
+        granite_settings.notify["prefers-color-scheme"].connect (() =>
+            gtk_settings.gtk_application_prefer_dark_theme = granite_settings.prefers_color_scheme == DARK
+        );
+
+        gtk_settings.gtk_application_prefer_dark_theme = granite_settings.prefers_color_scheme == DARK;
+    }
+
     protected override void activate () {
         if (active_window == null) {
             var main_window = new MainWindow ();