From 9cf31641a5df1507976859e571fb0881c6a4e375 Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Tue, 22 Jun 2021 17:06:03 +0800 Subject: [PATCH] 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 6a23ca6c47..0317fae799 100644 --- a/gdk/win32/gdkdrag-win32.c +++ b/gdk/win32/gdkdrag-win32.c @@ -795,11 +795,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; drag_win32->dnd_thread_items = display_win32->cb_dnd_items->clipdrop->dnd_thread_items; @@ -1911,7 +1907,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 4c7f4dfafe..d0af638c77 100644 --- a/gdk/win32/gdkdrop-win32.c +++ b/gdk/win32/gdkdrop-win32.c @@ -177,11 +177,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);