Merge branch 'main' into leolost/introduce-get-animation-duration

Author: lenemter

lib/DragDropAction.vala

@@ -216,40 +216,6 @@ namespace Gala {
 
                     return Clutter.EVENT_STOP;
 
-                case EventType.BUTTON_RELEASE:
-                case EventType.TOUCH_END:
-                    if (!is_valid_touch_event (event)) {
-                        return Clutter.EVENT_PROPAGATE;
-                    }
-
-                    if (!dragging) {
-                        float x, y, ex, ey;
-                        event.get_coords (out ex, out ey);
-                        actor.get_transformed_position (out x, out y);
-
-                        // release has happened within bounds of actor
-                        if (clicked && x < ex && x + actor.width > ex && y < ey && y + actor.height > ey) {
-                            actor_clicked (event.get_type () == BUTTON_RELEASE ? event.get_button () : Clutter.Button.PRIMARY);
-                        }
-
-                        if (clicked) {
-                            ungrab_actor ();
-                            clicked = false;
-                        }
-
-                        return Clutter.EVENT_STOP;
-                    } else if (dragging) {
-                        if (hovered != null) {
-                            finish ();
-                            hovered = null;
-                        } else {
-                            cancel ();
-                        }
-
-                        return Clutter.EVENT_STOP;
-                    }
-                    break;
-
                 default:
                     break;
             }
@@ -298,7 +264,42 @@ namespace Gala {
                     if (event.get_key_symbol () == Key.Escape) {
                         cancel ();
                     }
-                    break;
+
+                    return Clutter.EVENT_STOP;
+
+                case EventType.BUTTON_RELEASE:
+                case EventType.TOUCH_END:
+                    if (!is_valid_touch_event (event)) {
+                        return Clutter.EVENT_PROPAGATE;
+                    }
+
+                    if (dragging) {
+                        if (hovered != null) {
+                            finish ();
+                            hovered = null;
+                        } else {
+                            cancel ();
+                        }
+
+                        return Clutter.EVENT_STOP;
+                    }
+
+                    float x, y, ex, ey;
+                    event.get_coords (out ex, out ey);
+                    actor.get_transformed_position (out x, out y);
+
+                    // release has happened within bounds of actor
+                    if (clicked && x < ex && x + actor.width > ex && y < ey && y + actor.height > ey) {
+                        actor_clicked (event.get_type () == BUTTON_RELEASE ? event.get_button () : Clutter.Button.PRIMARY);
+                    }
+
+                    if (clicked) {
+                        ungrab_actor ();
+                        clicked = false;
+                    }
+
+                    return Clutter.EVENT_STOP;
+
                 case EventType.MOTION:
                 case EventType.TOUCH_UPDATE:
                     if (!is_valid_touch_event (event)) {
@@ -338,6 +339,7 @@ namespace Gala {
                             }
                         }
                         return Clutter.EVENT_STOP;
+
                     } else if (dragging) {
                         handle.x -= last_x - x;
                         handle.y -= last_y - y;
@@ -468,11 +470,11 @@ namespace Gala {
             var type = event.get_type ();
 
             return (
+                Meta.Util.is_wayland_compositor () ||
                 type != Clutter.EventType.TOUCH_BEGIN &&
                 type != Clutter.EventType.TOUCH_CANCEL &&
                 type != Clutter.EventType.TOUCH_END &&
-                type != Clutter.EventType.TOUCH_UPDATE ||
-                Meta.Util.is_wayland_compositor ()
+                type != Clutter.EventType.TOUCH_UPDATE
             );
         }
     }

plugins/pip/Main.vala

@@ -92,7 +92,7 @@ public class Gala.Plugins.PIP.Plugin : Gala.Plugin {
                 var rect = Graphene.Rect.alloc ();
                 rect.init (point_x, point_y, width, height);
 
-                var popup_window = new PopupWindow (wm, active);
+                var popup_window = new PopupWindow (wm.get_display (), active);
                 popup_window.set_container_clip (rect);
                 popup_window.show.connect (on_popup_window_show);
                 popup_window.hide.connect (on_popup_window_hide);
@@ -114,7 +114,7 @@ public class Gala.Plugins.PIP.Plugin : Gala.Plugin {
     private void select_window_at (int x, int y) {
         var selected = get_window_actor_at (x, y);
         if (selected != null) {
-            var popup_window = new PopupWindow (wm, selected);
+            var popup_window = new PopupWindow (wm.get_display (), selected);
             popup_window.show.connect (on_popup_window_show);
             popup_window.hide.connect (on_popup_window_hide);
             add_window (popup_window);

plugins/pip/PopupWindow.vala

@@ -16,7 +16,7 @@ public class Gala.Plugins.PIP.PopupWindow : Clutter.Actor {
 
     public signal void closed ();
 
-    public Gala.WindowManager wm { get; construct; }
+    public Meta.Display display { get; construct; }
     public Meta.WindowActor window_actor { get; construct; }
 
     private Clutter.Clone clone; // clone itself
@@ -52,12 +52,11 @@ public class Gala.Plugins.PIP.PopupWindow : Clutter.Actor {
             || window_type == Meta.WindowType.MODAL_DIALOG;
     }
 
-    public PopupWindow (Gala.WindowManager wm, Meta.WindowActor window_actor) {
-        Object (wm: wm, window_actor: window_actor);
+    public PopupWindow (Meta.Display display, Meta.WindowActor window_actor) {
+        Object (display: display, window_actor: window_actor);
     }
 
     construct {
-        unowned var display = wm.get_display ();
         var scale = display.get_monitor_scale (display.get_current_monitor ());
 
         button_size = Gala.Utils.scale_to_int (36, scale);
@@ -133,7 +132,7 @@ public class Gala.Plugins.PIP.PopupWindow : Clutter.Actor {
         window.unmanaged.connect (on_close_click_clicked);
         window.notify["appears-focused"].connect (update_window_focus);
 
-        unowned var workspace_manager = wm.get_display ().get_workspace_manager ();
+        unowned var workspace_manager = display.get_workspace_manager ();
         workspace_manager.active_workspace_changed.connect (update_window_focus);
     }
 
@@ -215,15 +214,15 @@ public class Gala.Plugins.PIP.PopupWindow : Clutter.Actor {
     }
 
     private Clutter.Actor on_move_begin () {
-        wm.get_display ().set_cursor (Meta.Cursor.DND_IN_DRAG);
+        display.set_cursor (Meta.Cursor.DND_IN_DRAG);
 
         return this;
     }
 
     private void on_move_end () {
         reactive = true;
         update_screen_position ();
-        wm.get_display ().set_cursor (Meta.Cursor.DEFAULT);
+        display.set_cursor (Meta.Cursor.DEFAULT);
     }
 
 #if HAS_MUTTER45
@@ -245,7 +244,7 @@ public class Gala.Plugins.PIP.PopupWindow : Clutter.Actor {
         grab = resize_button.get_stage ().grab (resize_button);
         resize_button.event.connect (on_resize_event);
 
-        wm.get_display ().set_cursor (Meta.Cursor.SE_RESIZE);
+        display.set_cursor (Meta.Cursor.SE_RESIZE);
 
         return Clutter.EVENT_PROPAGATE;
     }
@@ -306,7 +305,7 @@ public class Gala.Plugins.PIP.PopupWindow : Clutter.Actor {
 
         update_screen_position ();
 
-        wm.get_display ().set_cursor (Meta.Cursor.DEFAULT);
+        display.set_cursor (Meta.Cursor.DEFAULT);
     }
 
     private void on_allocation_changed () {
@@ -329,14 +328,14 @@ public class Gala.Plugins.PIP.PopupWindow : Clutter.Actor {
     }
 
     private void update_window_focus () {
-        unowned Meta.Window focus_window = wm.get_display ().get_focus_window ();
+        unowned Meta.Window focus_window = display.get_focus_window ();
         if ((focus_window != null && !get_window_is_normal (focus_window))
             || (previous_focus != null && !get_window_is_normal (previous_focus))) {
             previous_focus = focus_window;
             return;
         }
 
-        unowned var workspace_manager = wm.get_display ().get_workspace_manager ();
+        unowned var workspace_manager = display.get_workspace_manager ();
         unowned var active_workspace = workspace_manager.get_active_workspace ();
         unowned var window = window_actor.get_meta_window ();
 
@@ -520,7 +519,6 @@ public class Gala.Plugins.PIP.PopupWindow : Clutter.Actor {
     }
 
     private bool coord_is_in_other_monitor (float coord, Clutter.Orientation axis) {
-        var display = wm.get_display ();
         int n_monitors = display.get_n_monitors ();
 
         if (n_monitors == 1) {
@@ -553,7 +551,6 @@ public class Gala.Plugins.PIP.PopupWindow : Clutter.Actor {
 #else
     private void get_current_monitor_rect (out Meta.Rectangle rect) {
 #endif
-        var display = wm.get_display ();
         rect = display.get_monitor_geometry (display.get_current_monitor ());
     }
 

po/zh_TW.po

@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://github.com/elementary/gala/issues\n"
 "POT-Creation-Date: 2024-10-15 19:33+0000\n"
-"PO-Revision-Date: 2024-09-19 10:09+0000\n"
+"PO-Revision-Date: 2024-11-06 11:20+0000\n"
 "Last-Translator: Kisaragi Hiu <[email protected]>\n"
 "Language-Team: Chinese (Traditional) <https://l10n.elementary.io/projects/"
 "desktop/gala/zh_Hant/>\n"
@@ -151,11 +151,11 @@ msgstr "修正多工作業檢視中手勢可能會停止運作的問題"
 
 #: data/gala.metainfo.xml.in:109
 msgid "Improve dynamic workspaces behaviour with multiple monitors"
-msgstr "改善多螢幕時的動態工作空間行為"
+msgstr "改善多螢幕時的動態工作區行為"
 
 #: data/gala.metainfo.xml.in:131
 msgid "Improve handling of move-to-workspace shortcut"
-msgstr "改善移動到工作空間快捷鍵的處理"
+msgstr "改善「移動到工作區」快捷鍵的處理"
 
 #: data/gala-multitaskingview.desktop.in:4
 #: data/gala-multitaskingview.desktop.in:6

src/Background/BackgroundContainer.vala

@@ -20,14 +20,14 @@ namespace Gala {
         public signal void changed ();
         public signal void show_background_menu (int x, int y);
 
-        public WindowManager wm { get; construct; }
+        public Meta.Display display { get; construct; }
 
-        public BackgroundContainer (WindowManager wm) {
-            Object (wm: wm);
+        public BackgroundContainer (Meta.Display display) {
+            Object (display: display);
         }
 
         construct {
-            unowned var monitor_manager = wm.get_display ().get_context ().get_backend ().get_monitor_manager ();
+            unowned var monitor_manager = display.get_context ().get_backend ().get_monitor_manager ();
             monitor_manager.monitors_changed.connect (update);
 
             reactive = true;
@@ -44,7 +44,7 @@ namespace Gala {
         }
 
         ~BackgroundContainer () {
-            unowned var monitor_manager = wm.get_display ().get_context ().get_backend ().get_monitor_manager ();
+            unowned var monitor_manager = display.get_context ().get_backend ().get_monitor_manager ();
             monitor_manager.monitors_changed.disconnect (update);
         }
 
@@ -59,8 +59,8 @@ namespace Gala {
 
             destroy_all_children ();
 
-            for (var i = 0; i < wm.get_display ().get_n_monitors (); i++) {
-                var background = new BackgroundManager (wm, i);
+            for (var i = 0; i < display.get_n_monitors (); i++) {
+                var background = new BackgroundManager (display, i);
 
                 add_child (background);
 

src/Background/BackgroundManager.vala

@@ -10,7 +10,7 @@ public class Gala.BackgroundManager : Meta.BackgroundGroup, Gala.BackgroundManag
 
     public signal void changed ();
 
-    public WindowManager wm { get; construct; }
+    public Meta.Display display { get; construct; }
     public int monitor_index { get; construct; }
     public bool control_position { get; construct; }
     public bool rounded_corners { get; construct; }
@@ -24,12 +24,12 @@ 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, bool rounded_corners = true) {
-        Object (wm: wm, monitor_index: monitor_index, control_position: control_position, rounded_corners: rounded_corners);
+    public BackgroundManager (Meta.Display display, int monitor_index, bool control_position = true, bool rounded_corners = true) {
+        Object (display: display, monitor_index: monitor_index, control_position: control_position, rounded_corners: rounded_corners);
     }
 
     construct {
-        background_source = BackgroundCache.get_default ().get_background_source (wm.get_display ());
+        background_source = BackgroundCache.get_default ().get_background_source (display);
         update_background_actor (false);
 
         destroy.connect (on_destroy);
@@ -93,7 +93,7 @@ public class Gala.BackgroundManager : Meta.BackgroundGroup, Gala.BackgroundManag
 
         if (background.is_loaded) {
             if (rounded_corners) {
-                new_content.rounded_clip_radius = Utils.scale_to_int (6, wm.get_display ().get_monitor_scale (monitor_index));
+                new_content.rounded_clip_radius = Utils.scale_to_int (6, display.get_monitor_scale (monitor_index));
             }
 
             swap_background_actor (animate);
@@ -106,7 +106,7 @@ public class Gala.BackgroundManager : Meta.BackgroundGroup, Gala.BackgroundManag
             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));
+                new_content.rounded_clip_radius = Utils.scale_to_int (6, display.get_monitor_scale (monitor_index));
             }
 
             swap_background_actor (animate);
@@ -121,8 +121,6 @@ public class Gala.BackgroundManager : Meta.BackgroundGroup, Gala.BackgroundManag
     }
 
     private Meta.BackgroundActor create_background_actor () {
-        unowned var display = wm.get_display ();
-
         var background = background_source.get_background (monitor_index);
         var background_actor = new Meta.BackgroundActor (display, monitor_index);
 

src/DBus.vala

@@ -33,7 +33,7 @@ public class Gala.DBus {
         Bus.own_name (BusType.SESSION, "org.gnome.Shell", BusNameOwnerFlags.NONE,
             (connection) => {
                 try {
-                    connection.register_object ("/org/gnome/Shell", DBusAccelerator.init (wm));
+                    connection.register_object ("/org/gnome/Shell", DBusAccelerator.init (wm.get_display ()));
                     connection.register_object ("/org/gnome/Shell/Screenshot", ScreenshotManager.init (wm));
                 } catch (Error e) { warning (e.message); }
             },

src/DBusAccelerator.vala

@@ -75,22 +75,23 @@ namespace Gala {
         private static DBusAccelerator? instance;
 
         [DBus (visible = false)]
-        public static unowned DBusAccelerator init (WindowManager wm) {
-            if (instance == null)
-                instance = new DBusAccelerator (wm);
+        public static unowned DBusAccelerator init (Meta.Display display) {
+            if (instance == null) {
+                instance = new DBusAccelerator (display);
+            }
 
             return instance;
         }
 
         public signal void accelerator_activated (uint action, GLib.HashTable<string, Variant> parameters);
 
-        private WindowManager wm;
+        private Meta.Display display;
         private GLib.HashTable<unowned string, GrabbedAccelerator> grabbed_accelerators;
 
-        private DBusAccelerator (WindowManager _wm) {
-            wm = _wm;
+        private DBusAccelerator (Meta.Display _display) {
+            display = _display;
             grabbed_accelerators = new HashTable<unowned string, GrabbedAccelerator> (str_hash, str_equal);
-            wm.get_display ().accelerator_activated.connect (on_accelerator_activated);
+            display.accelerator_activated.connect (on_accelerator_activated);
         }
 
         private void on_accelerator_activated (uint action, Clutter.InputDevice device, uint timestamp) {
@@ -115,7 +116,7 @@ namespace Gala {
                 return found_accel.action;
             }
 
-            uint action = wm.get_display ().grab_accelerator (accelerator, grab_flags);
+            uint action = display.grab_accelerator (accelerator, grab_flags);
             if (action != Meta.KeyBindingFlags.NONE) {
                 var accel = new GrabbedAccelerator ();
                 accel.action = action;
@@ -141,7 +142,7 @@ namespace Gala {
         public bool ungrab_accelerator (uint action) throws GLib.DBusError, GLib.IOError {
             foreach (unowned GrabbedAccelerator accel in grabbed_accelerators.get_values ()) {
                 if (accel.action == action) {
-                    bool ret = wm.get_display ().ungrab_accelerator (action);
+                    bool ret = display.ungrab_accelerator (action);
                     grabbed_accelerators.remove (accel.name);
                     return ret;
                 }