AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

gtk: Stop using gdk_device_get_position

Browse Source 
We should always use the double variant of this api.
This commit is contained in:
Matthias Clasen 2019-03-25 20:26:59 -04:00
parent 8dece0e940
commit 7e4707642a
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gtk/gtknotebook.c
View File

@ -3137,11 +3137,11 @@ gtk_notebook_drag_end (GtkWidget *widget,
if (priv->rootwindow_drop)
{
GtkNotebook *dest_notebook = NULL;
gint x, y;
double x, y;
gdk_device_get_position (gdk_drag_get_device (drag), &x, &y);
gdk_device_get_position_double (gdk_drag_get_device (drag), &x, &y);
g_signal_emit (notebook, notebook_signals[CREATE_WINDOW], 0,
priv->detached_tab->child, x, y, &dest_notebook);
priv->detached_tab->child, round (x), round (y), &dest_notebook);
if (dest_notebook)
do_detach_tab (notebook, dest_notebook, priv->detached_tab->child);
@ -3186,12 +3186,12 @@ gtk_notebook_drag_failed (GtkWidget *widget,
if (result == GTK_DRAG_RESULT_NO_TARGET)
{
GtkNotebook *dest_notebook = NULL;
gint x, y;
double x, y;
gdk_device_get_position (gdk_drag_get_device (drag), &x, &y);
gdk_device_get_position_double (gdk_drag_get_device (drag), &x, &y);
g_signal_emit (notebook, notebook_signals[CREATE_WINDOW], 0,
priv->detached_tab->child, x, y, &dest_notebook);
priv->detached_tab->child, round (x), round (y), &dest_notebook);
if (dest_notebook)
do_detach_tab (notebook, dest_notebook, priv->detached_tab->child);

16
gtk/gtkwindow.c
View File

@ -7261,13 +7261,13 @@ static GdkMonitor *
get_monitor_containing_pointer (GtkWindow *window)
{
GtkWindowPrivate *priv = gtk_window_get_instance_private (window);
gint px, py;
double px, py;
GdkDevice *pointer;
pointer = gdk_seat_get_pointer (gdk_display_get_default_seat (priv->display));
gdk_device_get_position (pointer, &px, &py);
gdk_device_get_position_double (pointer, &px, &py);
return gdk_display_get_monitor_at_point (priv->display, px, py);
return gdk_display_get_monitor_at_point (priv->display, round (px), round (py));
}
static void
@ -7428,15 +7428,15 @@ gtk_window_compute_configure_request (GtkWindow *window,
GdkRectangle area;
GdkDevice *pointer;
GdkMonitor *monitor;
gint px, py;
double px, py;
pointer = gdk_seat_get_pointer (gdk_display_get_default_seat (priv->display));
gdk_device_get_position (pointer, &px, &py);
monitor = gdk_display_get_monitor_at_point (priv->display, px, py);
gdk_device_get_position_double (pointer, &px, &py);
monitor = gdk_display_get_monitor_at_point (priv->display, round (px), round (py));
x = px - w / 2;
y = py - h / 2;
x = round (px) - w / 2;
y = round (py) - h / 2;
/* Clamp onto current monitor, ignoring _NET_WM_STRUT and
* WM decorations.