[gtk/win32.fixes.4-4: 7/9] gdk[drag|drop]-win32.c: Don't unnecessarily compute scale
- From: Chun-wei Fan <fanchunwei src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/win32.fixes.4-4: 7/9] gdk[drag|drop]-win32.c: Don't unnecessarily compute scale
- Date: Fri, 17 Sep 2021 09:58:14 +0000 (UTC)
commit 7b4a48be7aa961a2e4cd9f093af951c2bc5483ac
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 4482e1b3ad..362eee6553 100644
--- a/gdk/win32/gdkdrag-win32.c
+++ b/gdk/win32/gdkdrag-win32.c
@@ -777,11 +777,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;
}
@@ -1907,7 +1903,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 d6e13a3d87..0d96097963 100644
--- a/gdk/win32/gdkdrop-win32.c
+++ b/gdk/win32/gdkdrop-win32.c
@@ -183,11 +183,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]