tiling: Skip the resize effect for tiled windows during user grabs.

meta_window_tile gets called by the grabbed window's match(es) during
tile resizing. These incremental changes don't need to be animated.

upstream:
https://gitlab.gnome.org/GNOME/mutter/-/commit/559e6ff327a358a6daa4b0683fee95700591749f

This reverts and replaces commit a8068f3.

Author: mtwebster

src/core/keybindings.c

@@ -3672,7 +3672,7 @@ handle_tile_action (MetaDisplay     *display,
     {
       window->tile_monitor_number = window->monitor->number;
       window->tile_mode = META_TILE_NONE;
-      meta_window_tile (window, new_mode, FALSE);
+      meta_window_tile (window, new_mode);
     }
 }
 

src/core/window-private.h

@@ -686,8 +686,7 @@ void        meta_window_queue              (MetaWindow  *window,
                                             guint queuebits);
 META_EXPORT_TEST
 void        meta_window_tile               (MetaWindow        *window,
-                                            MetaTileMode       mode,
-                                            gboolean           in_update_resize);
+                                            MetaTileMode       mode);
 MetaTileMode meta_window_get_tile_mode     (MetaWindow        *window);
 void        meta_window_restore_tile       (MetaWindow        *window,
                                             MetaTileMode       mode,

src/core/window.c

@@ -3287,8 +3287,7 @@ meta_window_get_tile_fractions (MetaWindow   *window,
 static void
 meta_window_update_tile_fractions (MetaWindow *window,
                                    int         new_w,
-                                   int         new_h,
-                                   gboolean    in_update_resize)
+                                   int         new_h)
 {
   MetaWindow *vtile_match = window->vtile_match;
   MetaWindow *htile_match = window->htile_match;
@@ -3304,10 +3303,10 @@ meta_window_update_tile_fractions (MetaWindow *window,
   window->tile_vfraction = (double)new_h / work_area.height;
 
   if (htile_match && window->display->grab_window == window)
-    meta_window_tile (htile_match, htile_match->tile_mode, in_update_resize);
+    meta_window_tile (htile_match, htile_match->tile_mode);
 
   if (vtile_match && window->display->grab_window == window)
-    meta_window_tile (vtile_match, vtile_match->tile_mode, in_update_resize);
+    meta_window_tile (vtile_match, vtile_match->tile_mode);
 }
 
 static void
@@ -3457,10 +3456,10 @@ update_edge_constraints (MetaWindow *window)
 
 void
 meta_window_tile (MetaWindow   *window,
-                  MetaTileMode  tile_mode,
-                  gboolean      in_update_resize)
+                  MetaTileMode  tile_mode)
 {
   MetaMaximizeFlags directions;
+
   /* Maximization constraints beat tiling constraints, so if the window
    * is maximized, tiling won't have any effect unless we unmaximize it
    * horizontally first; rather than calling meta_window_unmaximize(),
@@ -3506,12 +3505,14 @@ meta_window_tile (MetaWindow   *window,
   /* Setup the edge constraints */
   update_edge_constraints (window);
 
-  if (!in_update_resize)
+  if ((!window->htile_match || window->htile_match != window->display->grab_window) &&
+      (!window->vtile_match || window->vtile_match != window->display->grab_window))
     {
       MetaRectangle old_frame_rect, old_buffer_rect;
 
       meta_window_get_frame_rect (window, &old_frame_rect);
       meta_window_get_buffer_rect (window, &old_buffer_rect);
+
       meta_compositor_size_change_window (window->display->compositor, window,
                                           META_SIZE_CHANGE_TILE,
                                           &old_frame_rect, &old_buffer_rect);
@@ -3540,8 +3541,8 @@ meta_window_restore_tile (MetaWindow   *window,
                           int           width,
                           int           height)
 {
-  meta_window_update_tile_fractions (window, width, height, FALSE);
-  meta_window_tile (window, mode, FALSE);
+  meta_window_update_tile_fractions (window, width, height);
+  meta_window_tile (window, mode);
 }
 
 static gboolean
@@ -4727,7 +4728,7 @@ meta_window_resize_frame_with_gravity (MetaWindow *window,
        */
       if (window->display->grab_window == window)
         adjust_size_for_tile_match (window, &w, &h);
-      meta_window_update_tile_fractions (window, w, h, TRUE);
+      meta_window_update_tile_fractions (window, w, h);
     }
 
   flags = (user_op ? META_MOVE_RESIZE_USER_ACTION : 0) | META_MOVE_RESIZE_RESIZE_ACTION;
@@ -6899,7 +6900,7 @@ end_grab_op (MetaWindow *window,
       if (meta_grab_op_is_moving (window->display->grab_op))
         {
           if (window->display->preview_tile_mode != META_TILE_NONE)
-            meta_window_tile (window, window->display->preview_tile_mode, FALSE);
+            meta_window_tile (window, window->display->preview_tile_mode);
           else
             update_move (window,
                          modifiers & CLUTTER_SHIFT_MASK,

src/tests/monitor-unit-tests.c

@@ -6113,7 +6113,7 @@ meta_test_monitor_wm_tiling (void)
     g_error ("Failed to find the window: %s", error->message);
   test_client_wait_for_window_shown (test_client, test_window);
 
-  meta_window_tile (test_window, META_TILE_MAXIMIZED, FALSE);
+  meta_window_tile (test_window, META_TILE_MAXIMIZED);
   meta_window_move_to_monitor (test_window, 1);
   check_test_client_state (test_client);
 
@@ -6144,14 +6144,14 @@ meta_test_monitor_wm_tiling (void)
   emulate_hotplug (test_setup);
 
   meta_window_move_to_monitor (test_window, 1);
-  meta_window_tile (test_window, META_TILE_NONE, FALSE);
+  meta_window_tile (test_window, META_TILE_NONE);
 
   test_case.setup.n_outputs = 1;
   test_setup = create_monitor_test_setup (&test_case,
                                           MONITOR_TEST_FLAG_NO_STORED);
   emulate_hotplug (test_setup);
 
-  meta_window_tile (test_window, META_TILE_MAXIMIZED, FALSE);
+  meta_window_tile (test_window, META_TILE_MAXIMIZED);
 
   test_client_destroy (test_client);
 }