[gtk/wip.win32.fixes: 12/15] gdksurface-win32.c: Rename window->surface in snap_*()

[Chun-wei Fan <fanchunwei src gnome org>]

commit ff3d93e689eaeb595d664f5b1b4e9a898bb18e56
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Thu Jul 1 18:32:34 2021 +0800

    gdksurface-win32.c: Rename window->surface in snap_*()
    
    Since we are updating these functions, make the old GdkWindow-era
    variable names to match better the names we use nowadays.

 gdk/win32/gdksurface-win32.c | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)
---
diff --git a/gdk/win32/gdksurface-win32.c b/gdk/win32/gdksurface-win32.c
index e9da5f6701..9f387d0357 100644
--- a/gdk/win32/gdksurface-win32.c
+++ b/gdk/win32/gdksurface-win32.c
@@ -2292,22 +2292,22 @@ stash_window (GdkSurface          *window,
 }
 
 static void
-snap_up (GdkSurface *window)
+snap_up (GdkSurface *surface)
 {
   SHORT maxysize;
   int x, y;
   int width, height;
   GdkWin32Surface *impl;
 
-  impl = GDK_WIN32_SURFACE (window);
+  impl = GDK_WIN32_SURFACE (surface);
 
   impl->snap_state = GDK_WIN32_AEROSNAP_STATE_FULLUP;
 
-  stash_window (window, impl);
+  stash_window (surface, impl);
 
   maxysize = GetSystemMetrics (SM_CYVIRTUALSCREEN) / impl->surface_scale;
   x = y = 0;
-  width = gdk_surface_get_width (window);
+  width = gdk_surface_get_width (surface);
 
   y = 0;
   height = maxysize;
@@ -2319,36 +2319,36 @@ snap_up (GdkSurface *window)
 
   /* XXX: FIXME, AeroSnap snap_up() not really working well,
    *
-   *    * The snap_up() puts the window at the top left corner.
+   *    * The snap_up() puts the surface at the top left corner.
    *    * Without the following call, the height maximizes but we see a spew of
    *      "GdkToplevelSize: geometry size (x,y) exceeds bounds" warnings
    */
-  compute_toplevel_size (window, TRUE, &width, &height);
+  compute_toplevel_size (surface, TRUE, &width, &height);
 
-  if (GDK_IS_TOPLEVEL (window))
+  if (GDK_IS_TOPLEVEL (surface))
     {
       impl->drag_move_resize_context.native_move_resize_pending = FALSE;
       impl->toplevel_force_resize = FALSE;
     }
 
-  gdk_win32_surface_move_resize (window, x, y, width, height);
+  gdk_win32_surface_move_resize (surface, x, y, width, height);
 }
 
 static void
-snap_left (GdkSurface  *window,
+snap_left (GdkSurface *surface,
            GdkMonitor *monitor,
            GdkMonitor *snap_monitor)
 {
   GdkRectangle rect;
   GdkWin32Surface *impl;
 
-  impl = GDK_WIN32_SURFACE (window);
+  impl = GDK_WIN32_SURFACE (surface);
 
   impl->snap_state = GDK_WIN32_AEROSNAP_STATE_HALFLEFT;
 
   gdk_win32_monitor_get_workarea (snap_monitor, &rect);
 
-  stash_window (window, impl);
+  stash_window (surface, impl);
 
   rect.width = rect.width / 2;
 
@@ -2357,32 +2357,32 @@ snap_left (GdkSurface  *window,
   rect.width = rect.width + impl->shadow_x;
   rect.height = rect.height + impl->shadow_y;
 
-  if (GDK_IS_TOPLEVEL (window))
+  if (GDK_IS_TOPLEVEL (surface))
     {
       impl->drag_move_resize_context.native_move_resize_pending = FALSE;
       impl->toplevel_force_resize = FALSE;
     }
 
-  gdk_win32_surface_move_resize (window,
+  gdk_win32_surface_move_resize (surface,
                                  rect.x, rect.y,
                                  rect.width, rect.height);
 }
 
 static void
-snap_right (GdkSurface  *window,
+snap_right (GdkSurface *surface,
             GdkMonitor *monitor,
             GdkMonitor *snap_monitor)
 {
   GdkRectangle rect;
   GdkWin32Surface *impl;
 
-  impl = GDK_WIN32_SURFACE (window);
+  impl = GDK_WIN32_SURFACE (surface);
 
   impl->snap_state = GDK_WIN32_AEROSNAP_STATE_HALFRIGHT;
 
   gdk_win32_monitor_get_workarea (snap_monitor, &rect);
 
-  stash_window (window, impl);
+  stash_window (surface, impl);
 
   rect.width = rect.width / 2;
   rect.x += rect.width;
@@ -2392,13 +2392,13 @@ snap_right (GdkSurface  *window,
   rect.width = rect.width + impl->shadow_x;
   rect.height = rect.height + impl->shadow_y;
 
-  if (GDK_IS_TOPLEVEL (window))
+  if (GDK_IS_TOPLEVEL (surface))
     {
       impl->drag_move_resize_context.native_move_resize_pending = FALSE;
       impl->toplevel_force_resize = FALSE;
     }
 
-  gdk_win32_surface_move_resize (window,
+  gdk_win32_surface_move_resize (surface,
                                  rect.x, rect.y,
                                  rect.width, rect.height);
 }