Merge branch 'master' into background-respect-animations

elementary · Oct 26, 2023 · 0edcabf · 0edcabf
2 parents 40b1e8b + 5a917de
commit 0edcabf
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 0 deletions.
diff --git a/plugins/pip/PopupWindow.vala b/plugins/pip/PopupWindow.vala
@@ -218,12 +218,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);
+
         return this;
     }
 
     private void on_move_end () {
         reactive = true;
         update_screen_position ();
+        wm.get_display ().set_cursor (Meta.Cursor.DEFAULT);
     }
 
 #if HAS_MUTTER45
@@ -245,6 +248,8 @@ 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);
+
         return Clutter.EVENT_PROPAGATE;
     }
 
@@ -303,6 +308,8 @@ public class Gala.Plugins.PIP.PopupWindow : Clutter.Actor {
         resizing = false;
 
         update_screen_position ();
+
+        wm.get_display ().set_cursor (Meta.Cursor.DEFAULT);
     }
 
     private void on_allocation_changed () {

diff --git a/src/Widgets/IconGroup.vala b/src/Widgets/IconGroup.vala
@@ -519,6 +519,8 @@ namespace Gala {
             // disable reactivity so that workspace thumbs can get events
             reactive = false;
 
+            wm.get_display ().set_cursor (Meta.Cursor.DND_IN_DRAG);
+
             return this;
         }
 
@@ -534,11 +536,15 @@ namespace Gala {
             } else {
                 drag_canceled ();
             }
+
+            wm.get_display ().set_cursor (Meta.Cursor.DEFAULT);
         }
 
         private void drag_canceled () {
             get_parent ().remove_child (this);
             restore_group ();
+
+            wm.get_display ().set_cursor (Meta.Cursor.DEFAULT);
         }
 
         private void restore_group () {

diff --git a/src/Widgets/WindowClone.vala b/src/Widgets/WindowClone.vala
@@ -676,6 +676,8 @@ public class Gala.WindowClone : Clutter.Actor {
         close_button.opacity = 0;
         window_title.opacity = 0;
 
+        wm.get_display ().set_cursor (Meta.Cursor.DND_IN_DRAG);
+
         return this;
     }
 
@@ -726,6 +728,8 @@ public class Gala.WindowClone : Clutter.Actor {
                 icon_group.remove_window (window, false);
             }
         }
+
+        wm.get_display ().set_cursor (hovered ? Meta.Cursor.DND_MOVE: Meta.Cursor.DND_IN_DRAG);
     }
 
     /**
@@ -799,6 +803,8 @@ public class Gala.WindowClone : Clutter.Actor {
             // if we're dropped at the place where we came from interpret as cancel
             drag_canceled ();
         }
+
+        wm.get_display ().set_cursor (Meta.Cursor.DEFAULT);
     }
 
     /**
@@ -826,6 +832,8 @@ public class Gala.WindowClone : Clutter.Actor {
 
         set_window_icon_position (slot.width, slot.height, monitor_scale_factor);
         window_icon.restore_easing_state ();
+
+        wm.get_display ().set_cursor (Meta.Cursor.DEFAULT);
     }
 
     private void set_window_icon_position (float window_width, float window_height, float scale_factor, bool aligned = true) {