Merge branch 'main' into lenemter/guess-app

Author: leonardo-lemos

daemon-gtk3/Window.vala

@@ -6,13 +6,12 @@
  */
 
 public class Gala.Daemon.Window : Gtk.Window {
+    public int width { get; construct; }
+    public int height { get; construct; }
     public Gtk.Box content { get; construct; }
 
     public Window (int width, int height) {
-        Object (
-            default_width: width,
-            default_height: height
-        );
+        Object (width: width, height: height);
     }
 
     class construct {
@@ -34,7 +33,9 @@ public class Gala.Daemon.Window : Gtk.Window {
         title = "MODAL";
         child = content = new Gtk.Box (HORIZONTAL, 0) {
             hexpand = true,
-            vexpand = true
+            vexpand = true,
+            width_request = width,
+            height_request = height
         };
 
         set_visual (get_screen ().get_rgba_visual ());

daemon-gtk3/WindowMenu.vala

@@ -174,12 +174,12 @@ public class Gala.Daemon.WindowMenu : Gtk.Menu {
         SignalHandler.unblock (always_on_top, always_on_top_sid);
         SignalHandler.unblock (on_visible_workspace, on_visible_workspace_sid);
 
-        move_right.sensitive = !on_visible_workspace.active;
+        move_right.sensitive = !on_visible_workspace.active && Gala.WindowFlags.ALLOWS_MOVE_RIGHT in flags;
         if (move_right.sensitive) {
             move_right_accellabel.accel_string = keybind_settings.get_strv ("move-to-workspace-right")[0];
         }
 
-        move_left.sensitive = !on_visible_workspace.active;
+        move_left.sensitive = !on_visible_workspace.active && Gala.WindowFlags.ALLOWS_MOVE_LEFT in flags;
         if (move_left.sensitive) {
             move_left_accellabel.accel_string = keybind_settings.get_strv ("move-to-workspace-left")[0];
         }

daemon/DBus.vala

@@ -36,7 +36,9 @@ public enum Gala.WindowFlags {
     ALWAYS_ON_TOP,
     ON_ALL_WORKSPACES,
     CAN_CLOSE,
-    IS_TILED
+    IS_TILED,
+    ALLOWS_MOVE_LEFT,
+    ALLOWS_MOVE_RIGHT
 }
 
 [DBus (name = "org.pantheon.gala")]
@@ -173,8 +175,8 @@ public class Gala.Daemon.DBus : GLib.Object {
             y /= scale_factor;
         }
 
-        window.default_width = display_width;
-        window.default_height = display_height;
+        window.child.width_request = display_width;
+        window.child.height_request = display_height;
         window.present ();
 
         Gdk.Rectangle rect = {

daemon/WindowMenu.vala

@@ -200,12 +200,12 @@ public class Gala.Daemon.WindowMenu : Gtk.Popover {
         SignalHandler.unblock (always_on_top, always_on_top_sid);
         SignalHandler.unblock (on_visible_workspace, on_visible_workspace_sid);
 
-        move_right.sensitive = !on_visible_workspace.active;
+        move_right.sensitive = !on_visible_workspace.active && Gala.WindowFlags.ALLOWS_MOVE_RIGHT in flags;
         if (move_right.sensitive) {
             move_right_accellabel.accel_string = keybind_settings.get_strv ("move-to-workspace-right")[0];
         }
 
-        move_left.sensitive = !on_visible_workspace.active;
+        move_left.sensitive = !on_visible_workspace.active && Gala.WindowFlags.ALLOWS_MOVE_LEFT in flags;
         if (move_left.sensitive) {
             move_left_accellabel.accel_string = keybind_settings.get_strv ("move-to-workspace-left")[0];
         }

data/gala.metainfo.xml.in

@@ -35,7 +35,21 @@
         </ul>
       </description>
       <issues>
+        <issue url="https://github.com/elementary/dock/issues/68">Cannot move window to display below dock.</issue>
+        <issue url="https://github.com/elementary/dock/issues/425">Improper dock behaviour when it hides on vertically stacked monitors</issue>
+        <issue url="https://github.com/elementary/gala/issues/76">PIP: Grabbing an area too close to a Gtk3 window only grabs it's shadow</issue>
+        <issue url="https://github.com/elementary/gala/issues/132">Closing last window in the window overview doesn't close it</issue>
+        <issue url="https://github.com/elementary/gala/issues/340">"Move to left workspace" is a no-op on left-most workspace</issue>
+        <issue url="https://github.com/elementary/gala/issues/2060">Gala.ShadowEffect has performance issues</issue>
+        <issue url="https://github.com/elementary/gala/issues/2424">Mouse pointer often stuck between displays when external display is the primary display and is arranged above built-in display</issue>
+        <issue url="https://github.com/elementary/gala/issues/2230">Multitasking view background clipped when using multiple monitors above each other</issue>
+        <issue url="https://github.com/elementary/gala/issues/2263">Prevent windows from breaking workflow</issue>
         <issue url="https://github.com/elementary/gala/issues/2400">Switching workspaces makes the windows move down with multiple monitors</issue>
+        <issue url="https://github.com/elementary/gala/issues/2401">Context menus appear at the top left corner of the secondary monitor</issue>
+        <issue url="https://github.com/elementary/gala/issues/2409">Windows sometimes get stuck in an un-interactive state after using gestures to switch workspaces</issue>
+        <issue url="https://github.com/elementary/gala/issues/2410">Window position not restored correctly when going back from fullscreen</issue>
+        <issue url="https://github.com/elementary/gala/issues/2414">During workspace switch, windows on secondary display aren't shown</issue>
+        <issue url="https://github.com/elementary/gala/issues/2415">Wrong animation origin for windows on display 2 on workspace overview</issue>
       </issues>
     </release>
 

lib/CloseButton.vala

@@ -33,10 +33,7 @@ public class Gala.CloseButton : Clutter.Actor {
         var pixbuf = get_close_button_pixbuf (scale);
         if (pixbuf != null) {
             try {
-                var image = new Clutter.Image ();
-                Cogl.PixelFormat pixel_format = (pixbuf.get_has_alpha () ? Cogl.PixelFormat.RGBA_8888 : Cogl.PixelFormat.RGB_888);
-                image.set_data (pixbuf.get_pixels (), pixel_format, pixbuf.width, pixbuf.height, pixbuf.rowstride);
-
+                var image = new Gala.Image.from_pixbuf (pixbuf);
                 pixbuf_actor.set_content (image);
                 pixbuf_actor.set_size (pixbuf.width, pixbuf.height);
                 set_size (pixbuf.width, pixbuf.height);

lib/DragDropAction.vala

@@ -313,7 +313,11 @@ namespace Gala {
                     event.get_coords (out x, out y);
 
                     if (!dragging && clicked) {
+#if HAS_MUTTER47
+                        var drag_threshold = actor.context.get_settings ().dnd_drag_threshold;
+#else
                         var drag_threshold = Clutter.Settings.get_default ().dnd_drag_threshold;
+#endif
                         if (Math.fabsf (last_x - x) > drag_threshold || Math.fabsf (last_y - y) > drag_threshold) {
                             handle = drag_begin (last_x, last_y);
                             if (handle == null) {

lib/Image.vala

@@ -0,0 +1,75 @@
+/*
+ * Copyright 2015 Corentin Noël
+ * Copyright 2025 elementary, Inc. <https://elementary.io>
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+#if !HAS_MUTTER48
+public class Gala.Image : Clutter.Image {
+    public Image.from_pixbuf (Gdk.Pixbuf pixbuf) {
+        Object ();
+
+        Cogl.PixelFormat pixel_format = (pixbuf.get_has_alpha () ? Cogl.PixelFormat.RGBA_8888 : Cogl.PixelFormat.RGB_888);
+        try {
+            set_data (pixbuf.get_pixels (), pixel_format, pixbuf.width, pixbuf.height, pixbuf.rowstride);
+        } catch (Error e) {}
+    }
+}
+#else
+public class Gala.Image : GLib.Object, Clutter.Content {
+    Gdk.Pixbuf? pixbuf;
+    Cogl.Texture? texture;
+    uint width;
+    uint height;
+
+    public Image.from_pixbuf (Gdk.Pixbuf pixbuf) {
+        this.pixbuf = pixbuf;
+        width = pixbuf.width;
+        height = pixbuf.height;
+        invalidate ();
+    }
+
+    public bool get_preferred_size (out float width, out float height) {
+        if (texture == null) {
+            width = 0;
+            height = 0;
+            return false;
+        }
+
+        width = texture.get_width ();
+        height = texture.get_height ();
+        return true;
+    }
+
+    public void paint_content (Clutter.Actor actor, Clutter.PaintNode node, Clutter.PaintContext paint_context) {
+        if (pixbuf != null && texture == null) {
+            var cogl_context = actor.context.get_backend ().get_cogl_context ();
+            Cogl.PixelFormat pixel_format = (pixbuf.get_has_alpha () ? Cogl.PixelFormat.RGBA_8888 : Cogl.PixelFormat.RGB_888);
+            try {
+                texture = new Cogl.Texture2D.from_data (cogl_context, pixbuf.width, pixbuf.height, pixel_format, pixbuf.rowstride, pixbuf.get_pixels ());
+                if (width != texture.get_width () || height != texture.get_height ()) {
+                    width = texture.get_width ();
+                    height = texture.get_height ();
+                    invalidate_size ();
+                }
+            } catch (Error e) {
+                critical (e.message);
+            }
+        }
+
+        if (texture == null)
+            return;
+
+        var content_node = actor.create_texture_paint_node (texture);
+        content_node.set_static_name ("Image Content");
+        node.add_child (content_node);
+    }
+
+    public void invalidate () {
+        texture = null;
+    }
+
+    public void invalidate_size () {
+    }
+}
+#endif

lib/ShadowEffect.vala

@@ -5,6 +5,8 @@
  */
 
 public class Gala.ShadowEffect : Clutter.Effect {
+    private const float INITIAL_OPACITY = 0.25f;
+
     private class Shadow {
         public int users;
         public Cogl.Texture texture;
@@ -38,13 +40,13 @@ public class Gala.ShadowEffect : Clutter.Effect {
             _css_class = value;
             switch (value) {
                 case "workspace-switcher":
-                    shadow_size = 6;
+                    shadow_size = 3;
                     break;
                 case "window":
-                    shadow_size = 55;
+                    shadow_size = 26;
                     break;
                 default:
-                    shadow_size = 18;
+                    shadow_size = 9;
                     break;
             }
         }
@@ -100,43 +102,12 @@ public class Gala.ShadowEffect : Clutter.Effect {
             return shadow.texture;
         }
 
-        // fill a new texture for this size
-        var buffer = new Drawing.BufferSurface (width, height);
-        Drawing.Utilities.cairo_rounded_rectangle (
-            buffer.context,
-            shadow_size,
-            shadow_size,
-            width - shadow_size * 2,
-            height - shadow_size * 2,
-            border_radius
-        );
-
-        buffer.context.set_source_rgba (0, 0, 0, 0.7);
-        buffer.context.fill ();
-
-        buffer.exponential_blur (shadow_size / 2);
-
-        var surface = new Cairo.ImageSurface (Cairo.Format.ARGB32, width, height);
-        var cr = new Cairo.Context (surface);
-        cr.set_source_surface (buffer.surface, 0, 0);
-        cr.paint ();
-
-        cr.save ();
-        cr.set_operator (Cairo.Operator.CLEAR);
-        Drawing.Utilities.cairo_rounded_rectangle (cr, shadow_size, shadow_size, actor.width, actor.height, border_radius);
-        cr.fill ();
-        cr.restore ();
-
-        try {
-            var texture = new Cogl.Texture2D.from_data (context, width, height, Cogl.PixelFormat.BGRA_8888_PRE,
-                surface.get_stride (), surface.get_data ());
+        var texture = get_shadow_texture (context, width, height, shadow_size, border_radius);
+        if (texture != null) {
             shadow_cache.@set (current_key, new Shadow (texture));
-
-            return texture;
-        } catch (Error e) {
-            debug (e.message);
-            return null;
         }
+
+        return texture;
     }
 
     public override void paint (Clutter.PaintNode node, Clutter.PaintContext context, Clutter.EffectPaintFlags flags) {
@@ -149,8 +120,8 @@ public class Gala.ShadowEffect : Clutter.Effect {
             pipeline.set_layer_texture (0, shadow);
         }
 
-        var opacity = actor.get_paint_opacity () * shadow_opacity / 255.0f;
-        var alpha = Cogl.Color.from_4f (1.0f, 1.0f, 1.0f, opacity / 255.0f);
+        var opacity = actor.get_paint_opacity () * shadow_opacity * INITIAL_OPACITY / 255.0f / 255.0f;
+        var alpha = Cogl.Color.from_4f (1.0f, 1.0f, 1.0f, opacity);
         alpha.premultiply ();
 
         pipeline.set_color (alpha);
@@ -220,4 +191,91 @@ public class Gala.ShadowEffect : Clutter.Effect {
             return Source.REMOVE;
         });
     }
+
+    private Cogl.Texture? get_shadow_texture (Cogl.Context context, int width, int height, int shadow_size, int corner_radius) {
+        var data = new uint8[width * height];
+
+        // use fast Gaussian blur approximation
+        var precomputed_colors = new uint8[shadow_size + 1];
+        for (var i = 0; i <= shadow_size; i++) {
+            var normalized = (double) i / shadow_size;
+            precomputed_colors[i] = (uint8) (normalized * normalized * (3.0 - 2.0 * normalized) * 255.0);
+        }
+
+        var total_offset = shadow_size + corner_radius;
+
+        var target_row = height - total_offset;
+        for (var row = total_offset; row < target_row; row++) {
+            var current_row = row * width;
+            var current_row_end = current_row + width - 1;
+            for (int i = 0; i <= shadow_size; i++) {
+                var current_color = precomputed_colors[i];
+
+                data[current_row + i] = current_color;
+                data[current_row_end - i] = current_color;
+            }
+        }
+
+        var target_col = width - total_offset;
+        for (var row = 0; row <= shadow_size; row++) {
+            var current_row = row * width;
+            var end_row = (height - row) * width - 1;
+            var current_color = precomputed_colors[row];
+
+            for (var col = total_offset; col < target_col; col++) {
+                data[current_row + col] = current_color;
+                data[end_row - col] = current_color;
+            }
+        }
+
+        var target_square = shadow_size + corner_radius;
+        for (var y = 0; y < target_square; y++) {
+            var current_row = width * y;
+            var current_row_end = current_row + width - 1;
+            var end_row = (height - 1 - y) * width;
+            var end_row_end = end_row + width - 1;
+
+            var dy = target_square - y;
+            var dy_squared = dy * dy;
+
+            for (var x = 0; x < target_square; x++) {
+                var dx = target_square - x;
+                var squared_distance = dx * dx + dy_squared;
+
+                if (squared_distance > target_square * target_square) {
+                    continue;
+                }
+
+                if (squared_distance >= corner_radius * corner_radius) {
+                    double sin, cos;
+                    Math.sincos (Math.atan2 (dy, dx), out sin, out cos);
+
+                    var real_dx = dx - corner_radius * cos;
+                    var real_dy = dy - corner_radius * sin;
+
+                    // use fast Gaussian blur approximation
+                    var normalized = (double) Math.sqrt (real_dx * real_dx + real_dy * real_dy) / shadow_size;
+                    var current_color = (uint8) (1.0 - normalized * normalized * (3.0 - 2.0 * normalized) * 255.0);
+
+                    // when we're very close to the rounded corner, our real_distance can be wrong (idk why).
+                    // If we're here, we're not inside the corner yet and that means we must draw something
+                    if (current_color == 0) {
+                        current_color = 255;
+                    }
+
+                    data[current_row + x] = current_color;
+                    data[current_row_end - x] = current_color;
+                    data[end_row + x] = current_color;
+                    data[end_row_end - x] = current_color;
+                }
+            }
+        }
+
+        try {
+            return new Cogl.Texture2D.from_data (context, width, height, Cogl.PixelFormat.A_8, width, data);
+        } catch (Error e) {
+            warning ("ShadowEffect: Couldn't create texture");
+            return null;
+        }
+    }
 }