callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GdkWin32: Use scaled coordinates for move_resize_drag()

Browse Source 
Fixes https://gitlab.gnome.org/GNOME/gtk/-/issues/5877
This commit is contained in:
Luca Bacci
2023-06-21 17:00:00 +02:00
parent 7141305972
commit 6d0f34103d
1 changed files with 36 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
gdk/win32/gdkevents-win32.c
View File

@ -2879,10 +2879,14 @@ gdk_event_translate (MSG *msg,
break;
}
impl = GDK_WINDOW_IMPL_WIN32 (window->impl);
if (IS_POINTER_PRIMARY_WPARAM (msg->wParam))
{
current_root_x = pen_touch_cursor_position.x = GET_X_LPARAM (msg->lParam);
current_root_y = pen_touch_cursor_position.y = GET_Y_LPARAM (msg->lParam);
pen_touch_cursor_position.x = GET_X_LPARAM (msg->lParam);
pen_touch_cursor_position.y = GET_Y_LPARAM (msg->lParam);
current_root_x = pen_touch_cursor_position.x / impl->window_scale;
current_root_y = pen_touch_cursor_position.y / impl->window_scale;
pen_touch_input = TRUE;
last_digitizer_time = msg->time;
}
@ -2909,10 +2913,14 @@ gdk_event_translate (MSG *msg,
break;
}
impl = GDK_WINDOW_IMPL_WIN32 (window->impl);
if (IS_POINTER_PRIMARY_WPARAM (msg->wParam))
{
current_root_x = pen_touch_cursor_position.x = GET_X_LPARAM (msg->lParam);
current_root_y = pen_touch_cursor_position.y = GET_Y_LPARAM (msg->lParam);
pen_touch_cursor_position.x = GET_X_LPARAM (msg->lParam);
pen_touch_cursor_position.y = GET_Y_LPARAM (msg->lParam);
current_root_x = pen_touch_cursor_position.x / impl->window_scale;
current_root_y = pen_touch_cursor_position.y / impl->window_scale;
pen_touch_input = TRUE;
last_digitizer_time = msg->time;
}
@ -2924,7 +2932,6 @@ gdk_event_translate (MSG *msg,
gdk_winpointer_input_events (display, window, NULL, msg);
impl = GDK_WINDOW_IMPL_WIN32 (window->impl);
if (impl->drag_move_resize_context.op != GDK_WIN32_DRAGOP_NONE)
{
gdk_win32_window_end_move_resize_drag (window);
@ -2942,10 +2949,14 @@ gdk_event_translate (MSG *msg,
break;
}
impl = GDK_WINDOW_IMPL_WIN32 (window->impl);
if (IS_POINTER_PRIMARY_WPARAM (msg->wParam))
{
current_root_x = pen_touch_cursor_position.x = GET_X_LPARAM (msg->lParam);
current_root_y = pen_touch_cursor_position.y = GET_Y_LPARAM (msg->lParam);
pen_touch_cursor_position.x = GET_X_LPARAM (msg->lParam);
pen_touch_cursor_position.y = GET_Y_LPARAM (msg->lParam);
current_root_x = pen_touch_cursor_position.x / impl->window_scale;
current_root_y = pen_touch_cursor_position.y / impl->window_scale;
pen_touch_input = TRUE;
last_digitizer_time = msg->time;
}
@ -2958,8 +2969,6 @@ gdk_event_translate (MSG *msg,
if (IS_POINTER_PRIMARY_WPARAM (msg->wParam) && mouse_window != window)
crossing_cb = make_crossing_event;
impl = GDK_WINDOW_IMPL_WIN32 (window->impl);
if (impl->drag_move_resize_context.op != GDK_WIN32_DRAGOP_NONE)
{
gdk_win32_window_do_move_resize_drag (window, current_root_x, current_root_y);
@ -2981,10 +2990,14 @@ gdk_event_translate (MSG *msg,
break;
}
impl = GDK_WINDOW_IMPL_WIN32 (window->impl);
if (IS_POINTER_PRIMARY_WPARAM (msg->wParam))
{
current_root_x = pen_touch_cursor_position.x = GET_X_LPARAM (msg->lParam);
current_root_y = pen_touch_cursor_position.y = GET_Y_LPARAM (msg->lParam);
pen_touch_cursor_position.x = GET_X_LPARAM (msg->lParam);
pen_touch_cursor_position.y = GET_Y_LPARAM (msg->lParam);
current_root_x = pen_touch_cursor_position.x / impl->window_scale;
current_root_y = pen_touch_cursor_position.y / impl->window_scale;
pen_touch_input = TRUE;
last_digitizer_time = msg->time;
}
@ -3017,10 +3030,14 @@ gdk_event_translate (MSG *msg,
break;
}
impl = GDK_WINDOW_IMPL_WIN32 (window->impl);
if (IS_POINTER_PRIMARY_WPARAM (msg->wParam))
{
current_root_x = pen_touch_cursor_position.x = GET_X_LPARAM (msg->lParam);
current_root_y = pen_touch_cursor_position.y = GET_Y_LPARAM (msg->lParam);
pen_touch_cursor_position.x = GET_X_LPARAM (msg->lParam);
pen_touch_cursor_position.y = GET_Y_LPARAM (msg->lParam);
current_root_x = pen_touch_cursor_position.x / impl->window_scale;
current_root_y = pen_touch_cursor_position.y / impl->window_scale;
pen_touch_input = TRUE;
last_digitizer_time = msg->time;
}
@ -3047,10 +3064,14 @@ gdk_event_translate (MSG *msg,
break;
}
impl = GDK_WINDOW_IMPL_WIN32 (window->impl);
if (IS_POINTER_PRIMARY_WPARAM (msg->wParam))
{
current_root_x = pen_touch_cursor_position.x = GET_X_LPARAM (msg->lParam);
current_root_y = pen_touch_cursor_position.y = GET_Y_LPARAM (msg->lParam);
pen_touch_cursor_position.x = GET_X_LPARAM (msg->lParam);
pen_touch_cursor_position.y = GET_Y_LPARAM (msg->lParam);
current_root_x = pen_touch_cursor_position.x / impl->window_scale;
current_root_y = pen_touch_cursor_position.y / impl->window_scale;
pen_touch_input = TRUE;
last_digitizer_time = msg->time;
}