AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-12-26 13:41:07 +00:00
Code Issues Projects Releases Wiki Activity

Fix DND coordinates on Windows

Browse Source
This commit is contained in:
Luca Bacci 2021-09-06 18:54:30 +02:00
parent 3f798dbbcd
commit 93878da2ca
No known key found for this signature in database
GPG Key ID: 8E3C8D989C98883D
2 changed files with 51 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gdk/win32/gdkdrag-win32.c
View File

@ -2081,8 +2081,8 @@ gdk_dnd_handle_motion_event (GdkDrag *drag,
API_CALL (PostThreadMessage, (clipdrop->dnd_thread_id, API_CALL (PostThreadMessage, (clipdrop->dnd_thread_id,
WM_MOUSEMOVE, WM_MOUSEMOVE,
key_state, key_state,
MAKELPARAM (x * drag_win32->scale, MAKELPARAM (x_root * drag_win32->scale - _gdk_offset_x,
y * drag_win32->scale))); y_root * drag_win32->scale - _gdk_offset_y)));
return TRUE; return TRUE;
} }

52
gdk/win32/gdkdrop-win32.c
View File

@ -426,6 +426,31 @@ set_source_actions_helper (GdkDrop *drop,
return actions; return actions;
} }
/* Utility function to translate win32 screen coordinates to
* client coordinates (i.e. relative to the surface origin)
*
* Note that input is expected to be:
* a) NOT scaled by dpi_scale
* b) NOT translated by the GDK screen offset (gdk_offset_x / y)
*
* This utility function preserves subpixel precision
*/
static void
unscaled_screen_to_client (GdkSurface* surface,
double screen_x,
double screen_y,
double *client_x,
double *client_y)
{
POINT client_origin;
client_origin.x = 0;
client_origin.y = 0;
ClientToScreen (GDK_SURFACE_HWND (surface), &client_origin);
*client_x = screen_x - client_origin.x;
*client_y = screen_y - client_origin.y;
}
/* The pdwEffect here initially points /* The pdwEffect here initially points
* to a DWORD that contains the value of dwOKEffects argument in DoDragDrop, * to a DWORD that contains the value of dwOKEffects argument in DoDragDrop,
* i.e. the drag action that the drag source deems acceptable. * i.e. the drag action that the drag source deems acceptable.
@ -446,6 +471,8 @@ idroptarget_dragenter (LPDROPTARGET This,
GdkDisplay *display; GdkDisplay *display;
int pt_x; int pt_x;
int pt_y; int pt_y;
double x = 0.0;
double y = 0.0;
GdkDrag *drag; GdkDrag *drag;
GdkDragAction source_actions; GdkDragAction source_actions;
GdkDragAction dest_actions; GdkDragAction dest_actions;
@ -490,7 +517,12 @@ idroptarget_dragenter (LPDROPTARGET This,
set_data_object (&ctx->data_object, pDataObj); set_data_object (&ctx->data_object, pDataObj);
pt_x = pt.x / drop_win32->scale + _gdk_offset_x; pt_x = pt.x / drop_win32->scale + _gdk_offset_x;
pt_y = pt.y / drop_win32->scale + _gdk_offset_y; pt_y = pt.y / drop_win32->scale + _gdk_offset_y;
gdk_drop_emit_enter_event (drop, TRUE, pt_x, pt_y, GDK_CURRENT_TIME);
unscaled_screen_to_client (ctx->surface, pt.x, pt.y, &x, &y);
x /= drop_win32->scale;
y /= drop_win32->scale;
gdk_drop_emit_enter_event (drop, TRUE, x, y, GDK_CURRENT_TIME);
drop_win32->last_key_state = grfKeyState; drop_win32->last_key_state = grfKeyState;
drop_win32->last_x = pt_x; drop_win32->last_x = pt_x;
drop_win32->last_y = pt_y; drop_win32->last_y = pt_y;
@ -545,7 +577,14 @@ idroptarget_dragover (LPDROPTARGET This,
pt_y != drop_win32->last_y || pt_y != drop_win32->last_y ||
grfKeyState != drop_win32->last_key_state) grfKeyState != drop_win32->last_key_state)
{ {
gdk_drop_emit_motion_event (ctx->drop, TRUE, pt_x, pt_y, GDK_CURRENT_TIME); double x = 0.0;
double y = 0.0;
unscaled_screen_to_client (ctx->surface, pt.x, pt.y, &x, &y);
x /= drop_win32->scale;
y /= drop_win32->scale;
gdk_drop_emit_motion_event (ctx->drop, TRUE, x, y, GDK_CURRENT_TIME);
drop_win32->last_key_state = grfKeyState; drop_win32->last_key_state = grfKeyState;
drop_win32->last_x = pt_x; drop_win32->last_x = pt_x;
drop_win32->last_y = pt_y; drop_win32->last_y = pt_y;
@ -588,6 +627,8 @@ idroptarget_drop (LPDROPTARGET This,
GdkWin32Drop *drop_win32 = GDK_WIN32_DROP (ctx->drop); GdkWin32Drop *drop_win32 = GDK_WIN32_DROP (ctx->drop);
int pt_x = pt.x / drop_win32->scale + _gdk_offset_x; int pt_x = pt.x / drop_win32->scale + _gdk_offset_x;
int pt_y = pt.y / drop_win32->scale + _gdk_offset_y; int pt_y = pt.y / drop_win32->scale + _gdk_offset_y;
double x = 0.0;
double y = 0.0;
GdkDragAction dest_action; GdkDragAction dest_action;
GDK_NOTE (DND, g_print ("idroptarget_drop %p ", This)); GDK_NOTE (DND, g_print ("idroptarget_drop %p ", This));
@ -607,7 +648,12 @@ idroptarget_drop (LPDROPTARGET This,
grfKeyState); grfKeyState);
drop_win32->drop_finished = FALSE; drop_win32->drop_finished = FALSE;
gdk_drop_emit_drop_event (ctx->drop, TRUE, pt_x, pt_y, GDK_CURRENT_TIME);
unscaled_screen_to_client (ctx->surface, pt.x, pt.y, &x, &y);
x /= drop_win32->scale;
y /= drop_win32->scale;
gdk_drop_emit_drop_event (ctx->drop, TRUE, x, y, GDK_CURRENT_TIME);
while (!drop_win32->drop_finished) while (!drop_win32->drop_finished)
g_main_context_iteration (NULL, FALSE); g_main_context_iteration (NULL, FALSE);