Merge branch 'main' into main

Author: ErikReider

build-scripts/swaync-git.rpkg.spec

@@ -8,6 +8,7 @@ Summary:    Notification daemon with GTK GUI
 Provides:   desktop-notification-daemon
 Provides:   sway-notification-center = %{version}-%{release}
 Provides:   %{alt_pkg_name} = %{version}-%{release}
+Provides:   %{alt_pkg_name}-git = %{version}-%{release}
 License:    GPLv3
 URL:        https://github.com/ErikReider/SwayNotificationCenter
 VCS:        {{{ git_repo_vcs }}}

src/config.json.in

@@ -5,6 +5,7 @@
   "layer": "overlay",
   "control-center-layer": "top",
   "layer-shell": true,
+  "layer-shell-cover-screen": true,
   "cssPriority": "application",
   "control-center-margin-top": 0,
   "control-center-margin-bottom": 0,

src/configModel/configModel.vala

@@ -338,6 +338,12 @@ namespace SwayNotificationCenter {
          */
         public bool layer_shell { get; set; default = true; }
 
+        /**
+         * Wether or not the windows should cover the whole screen when
+         * layer-shell is used.
+         */
+        public bool layer_shell_cover_screen { get; set; default = true; }
+
         /** The CSS loading priority */
         public CssPriority cssPriority { // vala-lint=naming-convention
             get; set; default = CssPriority.APPLICATION;

src/configSchema.json

@@ -25,6 +25,11 @@
       "description": "Wether or not the windows should be opened as layer-shell surfaces. Note: Requires swaync restart to apply",
       "default": true
     },
+    "layer-shell-cover-screen": {
+      "type": "boolean",
+      "description": "Wether or not the windows should cover the whole screen when layer-shell is used. Fixes animations in compositors like Hyprland.",
+      "default": true
+    },
     "cssPriority": {
       "type": "string",
       "description": "Which GTK priority to use when loading the default and user CSS files. Pick \"user\" to override XDG_CONFIG_HOME/gtk-3.0/gtk.css",

src/controlCenter/controlCenter.vala

@@ -394,6 +394,11 @@ namespace SwayNotificationCenter {
 
         /** Resets the UI positions */
         private void set_anchor () {
+            PositionX pos_x = ConfigModel.instance.control_center_positionX;
+            if (pos_x == PositionX.NONE) pos_x = ConfigModel.instance.positionX;
+            PositionY pos_y = ConfigModel.instance.control_center_positionY;
+            if (pos_y == PositionY.NONE) pos_y = ConfigModel.instance.positionY;
+
             if (swaync_daemon.use_layer_shell) {
                 // Set the exlusive zone
                 int exclusive_zone = ConfigModel.instance.control_center_exclusive_zone ? 0 : 100;
@@ -423,6 +428,41 @@ namespace SwayNotificationCenter {
                         break;
                 }
                 GtkLayerShell.set_layer (this, layer);
+
+                // Set whether the control center should cover the whole screen or not
+                bool cover_screen = ConfigModel.instance.layer_shell_cover_screen;
+                GtkLayerShell.set_anchor (this, GtkLayerShell.Edge.TOP, cover_screen);
+                GtkLayerShell.set_anchor (this, GtkLayerShell.Edge.LEFT, cover_screen);
+                GtkLayerShell.set_anchor (this, GtkLayerShell.Edge.RIGHT, cover_screen);
+                GtkLayerShell.set_anchor (this, GtkLayerShell.Edge.BOTTOM, cover_screen);
+                if (!ConfigModel.instance.layer_shell_cover_screen) {
+                    switch (pos_x) {
+                        case PositionX.LEFT:
+                            GtkLayerShell.set_anchor (this, GtkLayerShell.Edge.LEFT, true);
+                            break;
+                        case PositionX.CENTER:
+                            GtkLayerShell.set_anchor (this, GtkLayerShell.Edge.LEFT, true);
+                            GtkLayerShell.set_anchor (this, GtkLayerShell.Edge.RIGHT, true);
+                            break;
+                        default:
+                        case PositionX.RIGHT:
+                            GtkLayerShell.set_anchor (this, GtkLayerShell.Edge.RIGHT, true);
+                            break;
+                    }
+                    switch (pos_y) {
+                        default:
+                        case PositionY.TOP:
+                            GtkLayerShell.set_anchor (this, GtkLayerShell.Edge.TOP, true);
+                            break;
+                        case PositionY.CENTER:
+                            GtkLayerShell.set_anchor (this, GtkLayerShell.Edge.TOP, true);
+                            GtkLayerShell.set_anchor (this, GtkLayerShell.Edge.BOTTOM, true);
+                            break;
+                        case PositionY.BOTTOM:
+                            GtkLayerShell.set_anchor (this, GtkLayerShell.Edge.BOTTOM, true);
+                            break;
+                    }
+                }
             }
 
             // Set the box margins
@@ -433,8 +473,6 @@ namespace SwayNotificationCenter {
 
             // Anchor box to north/south edges as needed
             Gtk.Align align_x = Gtk.Align.END;
-            PositionX pos_x = ConfigModel.instance.control_center_positionX;
-            if (pos_x == PositionX.NONE) pos_x = ConfigModel.instance.positionX;
             switch (pos_x) {
                 case PositionX.LEFT:
                     align_x = Gtk.Align.START;
@@ -448,8 +486,6 @@ namespace SwayNotificationCenter {
                     break;
             }
             Gtk.Align align_y = Gtk.Align.START;
-            PositionY pos_y = ConfigModel.instance.control_center_positionY;
-            if (pos_y == PositionY.NONE) pos_y = ConfigModel.instance.positionY;
             switch (pos_y) {
                 default:
                 case PositionY.TOP:

src/functions.vala

@@ -357,8 +357,8 @@ namespace SwayNotificationCenter {
                     spawn_env += additions;
                 }
 
-                string[] argvp = {};
-                Shell.parse_argv (cmd, out argvp);
+                string[] argvp;
+                Shell.parse_argv ("/bin/sh -c %s".printf (cmd), out argvp);
 
                 Pid child_pid;
                 int std_output;

src/swayncDaemon/swayncDaemon.vala

@@ -129,7 +129,9 @@ namespace SwayNotificationCenter {
 
         [DBus (visible = false)]
         public void show_blank_windows (Gdk.Monitor ? monitor) {
-            if (!use_layer_shell) return;
+            if (!use_layer_shell || !ConfigModel.instance.layer_shell_cover_screen) {
+                return;
+            }
             foreach (unowned BlankWindow win in blank_windows.data) {
                 if (win.monitor != monitor) win.show ();
             }