[gtk/backport-3144-4.0: 5/6] gdkwin32surface.[c|h]: Clean up code a bit
- From: Chun-wei Fan <fanchunwei src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/backport-3144-4.0: 5/6] gdkwin32surface.[c|h]: Clean up code a bit
- Date: Mon, 15 Feb 2021 03:13:39 +0000 (UTC)
commit 7bfcc034b4a719101e3b17070024bd5adba2cf1a
Author: Chun-wei Fan <fanchunwei src gnome org>
Date: Tue Feb 2 16:45:45 2021 +0800
gdkwin32surface.[c|h]: Clean up code a bit
Remove the 'resized' member from the GdkWin32Surface structure, as we already
have a structure with a member that keeps track of whether a surface is being
resized, so we can just use that and avoid some confusion in the process
gdk/win32/gdksurface-win32.c | 9 ++-------
gdk/win32/gdksurface-win32.h | 1 -
2 files changed, 2 insertions(+), 8 deletions(-)
---
diff --git a/gdk/win32/gdksurface-win32.c b/gdk/win32/gdksurface-win32.c
index 7853d1a83f..b9ec79e9ed 100644
--- a/gdk/win32/gdksurface-win32.c
+++ b/gdk/win32/gdksurface-win32.c
@@ -2273,7 +2273,6 @@ snap_up (GdkSurface *window)
impl = GDK_WIN32_SURFACE (window);
impl->snap_state = GDK_WIN32_AEROSNAP_STATE_FULLUP;
- impl->resized = FALSE;
stash_window (window, impl);
@@ -2311,7 +2310,6 @@ snap_left (GdkSurface *window,
impl = GDK_WIN32_SURFACE (window);
impl->snap_state = GDK_WIN32_AEROSNAP_STATE_HALFLEFT;
- impl->resized = FALSE;
gdk_win32_monitor_get_workarea (snap_monitor, &rect);
@@ -2340,7 +2338,6 @@ snap_right (GdkSurface *window,
impl = GDK_WIN32_SURFACE (window);
impl->snap_state = GDK_WIN32_AEROSNAP_STATE_HALFRIGHT;
- impl->resized = FALSE;
gdk_win32_monitor_get_workarea (snap_monitor, &rect);
@@ -3952,7 +3949,6 @@ gdk_win32_surface_do_move_resize_drag (GdkSurface *window,
impl->unscaled_height = new_rect.bottom - new_rect.top;
impl->next_layout.configured_width = (impl->unscaled_width + scale - 1) / scale;
impl->next_layout.configured_height = (impl->unscaled_height + scale - 1) / scale;
- impl->resized = TRUE;
}
context->native_move_resize_pending = TRUE;
@@ -4105,7 +4101,6 @@ gdk_win32_surface_maximize (GdkSurface *window)
_gdk_win32_surface_state_to_string (window->state)));
impl = GDK_WIN32_SURFACE (window);
- impl->resized = FALSE;
if (GDK_SURFACE_IS_MAPPED (window))
GtkShowWindow (window, SW_MAXIMIZE);
@@ -4550,7 +4545,7 @@ _gdk_win32_surface_request_layout (GdkSurface *surface)
int scale = impl->surface_scale;
RECT rect;
- if (GDK_IS_TOPLEVEL (surface) && impl->resized)
+ if (GDK_IS_TOPLEVEL (surface) && impl->drag_move_resize_context.native_move_resize_pending)
{
surface->width = impl->next_layout.configured_width;
surface->height = impl->next_layout.configured_height;
@@ -4578,7 +4573,7 @@ _gdk_win32_surface_compute_size (GdkSurface *surface)
if (GDK_IS_TOPLEVEL (surface))
compute_toplevel_size (surface, TRUE, &width, &height);
- if (!impl->resized)
+ if (!impl->drag_move_resize_context.native_move_resize_pending)
{
surface->width = impl->next_layout.configured_width;
surface->height = impl->next_layout.configured_height;
diff --git a/gdk/win32/gdksurface-win32.h b/gdk/win32/gdksurface-win32.h
index 1d0c9c6c7e..7c937cd0fc 100644
--- a/gdk/win32/gdksurface-win32.h
+++ b/gdk/win32/gdksurface-win32.h
@@ -343,7 +343,6 @@ struct _GdkWin32Surface
int configured_width;
int configured_height;
} next_layout;
- gboolean resized;
#ifdef GDK_WIN32_ENABLE_EGL
EGLSurface egl_surface;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]