Merge branch 'main' into leolost/fix-move-resize

lenemter · web-flow · commit 6117b34f864b · 2024-08-14T11:56:39.000+09:00
diff --git a/lib/Utils.vala b/lib/Utils.vala
@@ -400,15 +400,5 @@ namespace Gala {
 
             return texture;
         }
-
-        private static Gtk.CssProvider gala_css = null;
-        public static unowned Gtk.CssProvider? get_gala_css () {
-            if (gala_css == null) {
-                gala_css = new Gtk.CssProvider ();
-                gala_css.load_from_resource ("/io/elementary/desktop/gala/gala.css");
-            }
-
-            return gala_css;
-        }
     }
 }
diff --git a/src/Background/BackgroundManager.vala b/src/Background/BackgroundManager.vala
@@ -13,6 +13,7 @@ public class Gala.BackgroundManager : Meta.BackgroundGroup, Gala.BackgroundManag
     public WindowManager wm { get; construct; }
     public int monitor_index { get; construct; }
     public bool control_position { get; construct; }
+    public bool rounded_corners { get; construct; }
     public Meta.BackgroundActor newest_background_actor {
         get {
             return (new_background_actor != null) ? new_background_actor : background_actor;
@@ -23,8 +24,8 @@ public class Gala.BackgroundManager : Meta.BackgroundGroup, Gala.BackgroundManag
     private Meta.BackgroundActor? background_actor;
     private Meta.BackgroundActor? new_background_actor = null;
 
-    public BackgroundManager (WindowManager wm, int monitor_index, bool control_position = true) {
-        Object (wm: wm, monitor_index: monitor_index, control_position: control_position);
+    public BackgroundManager (WindowManager wm, int monitor_index, bool control_position = true, bool rounded_corners = true) {
+        Object (wm: wm, monitor_index: monitor_index, control_position: control_position, rounded_corners: rounded_corners);
     }
 
     construct {
@@ -91,7 +92,10 @@ public class Gala.BackgroundManager : Meta.BackgroundGroup, Gala.BackgroundManag
         var background = new_content.background.get_data<unowned Background> ("delegate");
 
         if (background.is_loaded) {
-            new_content.rounded_clip_radius = Utils.scale_to_int (6, wm.get_display ().get_monitor_scale (monitor_index));
+            if (rounded_corners) {
+                new_content.rounded_clip_radius = Utils.scale_to_int (6, wm.get_display ().get_monitor_scale (monitor_index));
+            }
+
             swap_background_actor (animate);
             return;
         }
@@ -101,8 +105,11 @@ public class Gala.BackgroundManager : Meta.BackgroundGroup, Gala.BackgroundManag
             background.disconnect (handler);
             background.set_data<ulong> ("background-loaded-handler", 0);
 
+            if (rounded_corners) {
+                new_content.rounded_clip_radius = Utils.scale_to_int (6, wm.get_display ().get_monitor_scale (monitor_index));
+            }
+
             swap_background_actor (animate);
-            new_content.rounded_clip_radius = Utils.scale_to_int (6, wm.get_display ().get_monitor_scale (monitor_index));
         });
         background.set_data<ulong> ("background-loaded-handler", handler);
     }
diff --git a/src/DesktopIntegration.vala b/src/DesktopIntegration.vala
@@ -44,6 +44,10 @@ public class Gala.DesktopIntegration : GLib.Object {
             return false;
         }
 
+        if (ShellClientsManager.get_instance ().is_positioned_window (window)) {
+            return false;
+        }
+
         switch (window.get_window_type ()) {
             case Meta.WindowType.NORMAL:
             case Meta.WindowType.DIALOG:
diff --git a/src/ScreenshotManager.vala b/src/ScreenshotManager.vala
@@ -300,7 +300,7 @@ namespace Gala {
             return Environment.get_home_dir ();
         }
 
-        private static async bool save_image (Cairo.ImageSurface image, string filename, float scale, out string used_filename) {
+        private async bool save_image (Cairo.ImageSurface image, string filename, float scale, out string used_filename) {
             return (filename != "")
                 ? yield save_image_to_file (image, filename, scale, out used_filename)
                 : save_image_to_clipboard (image, filename, out used_filename);
@@ -342,19 +342,32 @@ namespace Gala {
             }
         }
 
-        private static bool save_image_to_clipboard (Cairo.ImageSurface image, string filename, out string used_filename) {
+        private bool save_image_to_clipboard (Cairo.ImageSurface image, string filename, out string used_filename) {
             used_filename = filename;
 
-            unowned Gdk.Display display = Gdk.Display.get_default ();
-            unowned Gtk.Clipboard clipboard = Gtk.Clipboard.get_default (display);
-
             var screenshot = Gdk.pixbuf_get_from_surface (image, 0, 0, image.get_width (), image.get_height ());
             if (screenshot == null) {
-                warning ("could not save screenshot to clipboard: null pixbuf");
+                warning ("Could not save screenshot to clipboard: null pixbuf");
+                return false;
+            }
+
+            uint8[] buffer;
+            try {
+                screenshot.save_to_buffer (out buffer, "png");
+            } catch (Error e) {
+                warning ("Could not save screenshot to clipboard: failed to save image to buffer: %s", e.message);
+                return false;
+            }
+
+            try {
+                unowned var selection = wm.get_display ().get_selection ();
+                var source = new Meta.SelectionSourceMemory ("image/png", new GLib.Bytes.take (buffer));
+                selection.set_owner (Meta.SelectionType.SELECTION_CLIPBOARD, source);
+            } catch (Error e) {
+                warning ("Could not save screenshot to clipboard: failed to create new Meta.SelectionSourceMemory: %s", e.message);
                 return false;
             }
 
-            clipboard.set_image (screenshot);
             return true;
         }
 
diff --git a/src/Widgets/MultitaskingView.vala b/src/Widgets/MultitaskingView.vala
@@ -86,7 +86,7 @@ namespace Gala {
             brightness_effect = new Clutter.BrightnessContrastEffect ();
             update_brightness_effect ();
 
-            var blurred_bg = new BackgroundManager (wm, display.get_primary_monitor ());
+            var blurred_bg = new BackgroundManager (wm, display.get_primary_monitor (), true, false);
             blurred_bg.add_effect (new BlurEffect (blurred_bg, 18));
             blurred_bg.add_effect (brightness_effect);
 
diff --git a/src/Widgets/WorkspaceClone.vala b/src/Widgets/WorkspaceClone.vala
@@ -31,7 +31,8 @@ namespace Gala {
             Object (
                 wm: wm,
                 monitor_index: wm.get_display ().get_primary_monitor (),
-                control_position: false
+                control_position: false,
+                rounded_corners: true
             );
         }
 
diff --git a/src/WindowManager.vala b/src/WindowManager.vala
@@ -2017,13 +2017,17 @@ namespace Gala {
             var from_has_fullscreened = false;
 
             // collect all windows and put them in the appropriate containers
-            foreach (unowned Meta.WindowActor actor in display.get_window_actors ()) {
+            var slist = new GLib.SList<Meta.Window> ();
+            display.list_all_windows ().@foreach ((win) => {
+                slist.append (win);
+            });
+            foreach (unowned var window in display.sort_windows_by_stacking (slist)) {
+                unowned var actor = (Meta.WindowActor) window.get_compositor_private ();
+
                 if (actor.is_destroyed ()) {
                     continue;
                 }
 
-                unowned var window = actor.get_meta_window ();
-
                 if (!window.showing_on_its_workspace () ||
                     move_primary_only && !window.is_on_primary_monitor () ||
                     window == moving ||
diff --git a/src/Zoom.vala b/src/Zoom.vala
@@ -115,7 +115,7 @@ public class Gala.Zoom : Object {
         // Nothing to do if zooming out of our bounds is requested
         if ((current_zoom <= MIN_ZOOM && delta < 0) || (current_zoom >= MAX_ZOOM && delta >= 0)) {
             if (play_sound) {
-                Gdk.beep ();
+                Clutter.get_default_backend ().get_default_seat ().bell_notify ();
             }
             return;
         }
diff --git a/vapi/libmutter.vapi b/vapi/libmutter.vapi
@@ -792,7 +792,7 @@ namespace Meta {
 	[CCode (cheader_filename = "meta/meta-selection-source-memory.h", type_id = "meta_selection_source_memory_get_type ()")]
 	public sealed class SelectionSourceMemory : Meta.SelectionSource {
 		[CCode (has_construct_function = false, type = "MetaSelectionSource*")]
-		public SelectionSourceMemory (string mimetype, GLib.Bytes content);
+		public SelectionSourceMemory (string mimetype, GLib.Bytes content) throws GLib.Error;
 	}
 	[CCode (cheader_filename = "meta/meta-settings.h", has_type_id = false)]
 	[Compact]

Original file line number	Diff line number	Diff line change
`@@ -400,15 +400,5 @@ namespace Gala {`
`400`	`400`
`401`	`401`	`return texture;`
`402`	`402`	`}`
`403`		`-`
`404`		`- private static Gtk.CssProvider gala_css = null;`
`405`		`- public static unowned Gtk.CssProvider? get_gala_css () {`
`406`		`- if (gala_css == null) {`
`407`		`- gala_css = new Gtk.CssProvider ();`
`408`		`- gala_css.load_from_resource ("/io/elementary/desktop/gala/gala.css");`
`409`		`- }`
`410`		`-`
`411`		`- return gala_css;`
`412`		`- }`
`413`	`403`	`}`
`414`	`404`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,8 @@ namespace Gala {`
`31`	`31`	`Object (`
`32`	`32`	`wm: wm,`
`33`	`33`	`monitor_index: wm.get_display ().get_primary_monitor (),`
`34`		`- control_position: false`
	`34`	`+ control_position: false,`
	`35`	`+ rounded_corners: true`
`35`	`36`	`);`
`36`	`37`	`}`
`37`	`38`
Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,7 @@ public class Gala.Zoom : Object {`
`115`	`115`	`// Nothing to do if zooming out of our bounds is requested`
`116`	`116`	`if ((current_zoom <= MIN_ZOOM && delta < 0) \|\| (current_zoom >= MAX_ZOOM && delta >= 0)) {`
`117`	`117`	`if (play_sound) {`
`118`		`- Gdk.beep ();`
	`118`	`+ Clutter.get_default_backend ().get_default_seat ().bell_notify ();`
`119`	`119`	`}`
`120`	`120`	`return;`
`121`	`121`	`}`
Original file line number	Diff line number	Diff line change
`@@ -792,7 +792,7 @@ namespace Meta {`
`792`	`792`	`[CCode (cheader_filename = "meta/meta-selection-source-memory.h", type_id = "meta_selection_source_memory_get_type ()")]`
`793`	`793`	`public sealed class SelectionSourceMemory : Meta.SelectionSource {`
`794`	`794`	`[CCode (has_construct_function = false, type = "MetaSelectionSource*")]`
`795`		`- public SelectionSourceMemory (string mimetype, GLib.Bytes content);`
	`795`	`+ public SelectionSourceMemory (string mimetype, GLib.Bytes content) throws GLib.Error;`
`796`	`796`	`}`
`797`	`797`	`[CCode (cheader_filename = "meta/meta-settings.h", has_type_id = false)]`
`798`	`798`	`[Compact]`