diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2021-06-18 17:31:51 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2021-06-18 17:31:51 +0000 |
| commit | 13a2db22381d102258e44e4af7d5828e7c781705 (patch) | |
| tree | 5a79db5d4fe49066185f0542aebf621f9c2a7201 /gdk | |
| parent | e8f9fb0f869223edb2cb3d67c142434cab663043 (diff) | |
| parent | e35490ba5b6079a15d3be84cbe42d100e46ec120 (diff) | |
| download | gtk+-13a2db22381d102258e44e4af7d5828e7c781705.tar.gz | |
Merge branch 'fix-3798' into 'master'
GDK-Win32: Fix drag surface positioning (issue #3798)
Closes #3798
See merge request GNOME/gtk!3659
Diffstat (limited to 'gdk')
| -rw-r--r-- | gdk/win32/gdkdrag-win32.c | 4 | ||||
| -rw-r--r-- | gdk/win32/gdkevents-win32.c | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/gdk/win32/gdkdrag-win32.c b/gdk/win32/gdkdrag-win32.c index df81a73cec..419889ebe1 100644 --- a/gdk/win32/gdkdrag-win32.c +++ b/gdk/win32/gdkdrag-win32.c @@ -2345,8 +2345,8 @@ gdk_dnd_handle_motion_event (GdkDrag *drag, state = gdk_event_get_modifier_state (event); gdk_event_get_position (event, &x, &y); - x_root = x + _gdk_offset_x; - y_root = y + _gdk_offset_y; + x_root = event->surface->x + x; + y_root = event->surface->y + y; if (drag_win32->drag_surface) move_drag_surface (drag, x_root, y_root); diff --git a/gdk/win32/gdkevents-win32.c b/gdk/win32/gdkevents-win32.c index 5a17522ae1..808354c4ae 100644 --- a/gdk/win32/gdkevents-win32.c +++ b/gdk/win32/gdkevents-win32.c @@ -2343,7 +2343,6 @@ gdk_event_translate (MSG *msg, current_root_x = (msg->pt.x + _gdk_offset_x) / impl->surface_scale; current_root_y = (msg->pt.y + _gdk_offset_y) / impl->surface_scale; - if (impl->drag_move_resize_context.op != GDK_WIN32_DRAGOP_NONE) gdk_win32_surface_do_move_resize_drag (window, current_root_x, current_root_y); else if (_gdk_input_ignore_core == 0) |