[gtk/wip.win32.fixes: 20/27] gdk[drag|drop]-win32.c: Don't unnecessarily compute scale




commit d7807db743c8f826bd7c0fd6fd6d36351f9fc487
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Tue Jun 22 17:06:03 2021 +0800

    gdk[drag|drop]-win32.c: Don't unnecessarily compute scale
    
    The GdkWin32Display object already did that when we created it, so just
    use whatever that is stored in there.

 gdk/win32/gdkdrag-win32.c | 7 +------
 gdk/win32/gdkdrop-win32.c | 6 +-----
 2 files changed, 2 insertions(+), 11 deletions(-)
---
diff --git a/gdk/win32/gdkdrag-win32.c b/gdk/win32/gdkdrag-win32.c
index a53f6569b1..665be2a066 100644
--- a/gdk/win32/gdkdrag-win32.c
+++ b/gdk/win32/gdkdrag-win32.c
@@ -780,11 +780,7 @@ gdk_drag_new (GdkDisplay         *display,
                              NULL);
 
   drag = GDK_DRAG (drag_win32);
-
-  if (display_win32->has_fixed_scale)
-    drag_win32->scale = display_win32->surface_scale;
-  else
-    drag_win32->scale = gdk_win32_display_get_monitor_scale_factor (display_win32, NULL, NULL);
+  drag_win32->scale = display_win32->surface_scale;
 
   return drag;
 }
@@ -1910,7 +1906,6 @@ gdk_win32_drag_drop_done (GdkDrag  *drag,
   if (success)
     {
       gdk_surface_hide (drag_win32->drag_surface);
-
       return;
     }
 
diff --git a/gdk/win32/gdkdrop-win32.c b/gdk/win32/gdkdrop-win32.c
index 41647f7574..329ee0a625 100644
--- a/gdk/win32/gdkdrop-win32.c
+++ b/gdk/win32/gdkdrop-win32.c
@@ -182,11 +182,7 @@ gdk_drop_new (GdkDisplay        *display,
                              "surface", surface,
                              NULL);
 
-  if (display_win32->has_fixed_scale)
-    drop_win32->scale = display_win32->surface_scale;
-  else
-    drop_win32->scale = gdk_win32_display_get_monitor_scale_factor (display_win32, NULL, NULL);
-
+  drop_win32->scale = display_win32->surface_scale;
   drop_win32->protocol = protocol;
 
   return GDK_DROP (drop_win32);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]