From 2bf7197e7e860904dbe083ca6dced305b9cb6f85 Mon Sep 17 00:00:00 2001
From: Leo <lenemter@gmail.com>
Date: Thu, 18 Jan 2024 19:30:32 +0900
Subject: [PATCH] move_window: require timestamp (#1831)

---
 lib/WindowManager.vala |  2 +-
 src/WindowManager.vala | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/WindowManager.vala b/lib/WindowManager.vala
index 04620f29..0d5e694d 100644
--- a/lib/WindowManager.vala
+++ b/lib/WindowManager.vala
@@ -173,7 +173,7 @@ namespace Gala {
          * @param window    The window to be moved
          * @param workspace The workspace the window should be moved to
          */
-        public abstract void move_window (Meta.Window? window, Meta.Workspace workspace);
+        public abstract void move_window (Meta.Window? window, Meta.Workspace workspace, uint32 timestamp);
 
         /**
          * Switches to the next workspace in the given direction.
diff --git a/src/WindowManager.vala b/src/WindowManager.vala
index 5416783e..b4453649 100644
--- a/src/WindowManager.vala
+++ b/src/WindowManager.vala
@@ -458,7 +458,7 @@ namespace Gala {
             }
 
             if (target_workspace != null) {
-                move_window (window, target_workspace);
+                move_window (window, target_workspace, event.get_time ());
             }
         }
 
@@ -792,7 +792,7 @@ namespace Gala {
         /**
          * {@inheritDoc}
          */
-        public void move_window (Meta.Window? window, Meta.Workspace workspace) {
+        public void move_window (Meta.Window? window, Meta.Workspace workspace, uint32 timestamp) {
             if (window == null) {
                 return;
             }
@@ -820,7 +820,7 @@ namespace Gala {
                 window.change_workspace (workspace);
             }
 
-            workspace.activate_with_focus (window, display.get_current_time ());
+            workspace.activate_with_focus (window, timestamp);
         }
 
         /**
@@ -991,13 +991,13 @@ namespace Gala {
                     unowned var workspace_manager = get_display ().get_workspace_manager ();
                     unowned var active_workspace = workspace_manager.get_active_workspace ();
                     unowned var target_workspace = active_workspace.get_neighbor (Meta.MotionDirection.LEFT);
-                    move_window (current, target_workspace);
+                    move_window (current, target_workspace, Gtk.get_current_event_time ());
                     break;
                 case ActionType.MOVE_CURRENT_WORKSPACE_RIGHT:
                     unowned var workspace_manager = get_display ().get_workspace_manager ();
                     unowned var active_workspace = workspace_manager.get_active_workspace ();
                     unowned var target_workspace = active_workspace.get_neighbor (Meta.MotionDirection.RIGHT);
-                    move_window (current, target_workspace);
+                    move_window (current, target_workspace, Gtk.get_current_event_time ());
                     break;
                 case ActionType.CLOSE_CURRENT:
                     if (current != null && current.can_close ())