Move reduce transparency to main window (#372)

elementary · Feb 14, 2025 · 48cf2ad · 48cf2ad
1 parent 43aaf3c
commit 48cf2ad
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 23 deletions.
diff --git a/data/Application.css b/data/Application.css
@@ -1,6 +1,6 @@
 /*
  * SPDX-License-Identifier: GPL-3.0
- * SPDX-FileCopyrightText: 2023 elementary, Inc. (https://elementary.io)
+ * SPDX-FileCopyrightText: 2023-2025 elementary, Inc. (https://elementary.io)
  */
 
 dock {
@@ -18,7 +18,7 @@ dock {
     padding: 9px;
 }
 
-dock.reduce-transparency {
+.reduce-transparency dock {
     opacity: 1;
 }
 

diff --git a/src/MainWindow.vala b/src/MainWindow.vala
@@ -1,33 +1,13 @@
 /*
  * SPDX-License-Identifier: GPL-3.0
- * SPDX-FileCopyrightText: 2022-2024 elementary, Inc. (https://elementary.io)
+ * SPDX-FileCopyrightText: 2022-2025 elementary, Inc. (https://elementary.io)
  */
 
 public class Dock.MainWindow : Gtk.ApplicationWindow {
     private class Container : Gtk.Box {
-        private Settings transparency_settings;
-
         class construct {
             set_css_name ("dock");
         }
-
-        construct {
-            var transparency_schema = SettingsSchemaSource.get_default ().lookup ("io.elementary.desktop.wingpanel", true);
-            if (transparency_schema != null && transparency_schema.has_key ("use-transparency")) {
-                transparency_settings = new Settings ("io.elementary.desktop.wingpanel");
-                transparency_settings.changed["use-transparency"].connect (update_transparency);
-                update_transparency ();
-            }
-        }
-
-        private void update_transparency () {
-            if (transparency_settings.get_boolean ("use-transparency")) {
-                remove_css_class ("reduce-transparency");
-            } else {
-                add_css_class ("reduce-transparency");
-
-            }
-        }
     }
 
     private class BottomMargin : Gtk.Widget {
@@ -36,6 +16,7 @@ public class Dock.MainWindow : Gtk.ApplicationWindow {
         }
     }
 
+    private Settings transparency_settings;
     private static Settings settings = new Settings ("io.elementary.dock");
 
     private Pantheon.Desktop.Shell? desktop_shell;
@@ -85,6 +66,22 @@ public class Dock.MainWindow : Gtk.ApplicationWindow {
                 update_panel_x11 ();
             }
         });
+
+        var transparency_schema = SettingsSchemaSource.get_default ().lookup ("io.elementary.desktop.wingpanel", true);
+        if (transparency_schema != null && transparency_schema.has_key ("use-transparency")) {
+            transparency_settings = new Settings ("io.elementary.desktop.wingpanel");
+            transparency_settings.changed["use-transparency"].connect (update_transparency);
+            update_transparency ();
+        }
+    }
+
+    private void update_transparency () {
+        if (transparency_settings.get_boolean ("use-transparency")) {
+            remove_css_class ("reduce-transparency");
+        } else {
+            add_css_class ("reduce-transparency");
+
+        }
     }
 
     public void registry_handle_global (Wl.Registry wl_registry, uint32 name, string @interface, uint32 version) {