AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-17 23:10:22 +00:00
Code Issues Projects Releases Wiki Activity

paned: Pass x/y position to update_drag()

Browse Source 
This way we get the coordinates from the right device instead of using
any random device.
This commit is contained in:
Benjamin Otte 2011-11-08 16:47:08 +01:00
parent 80a23a2f2b
commit 28d0403f17
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
gtk/gtkpaned.c
View File

@ -1520,7 +1520,9 @@ is_rtl (GtkPaned *paned)
static void
update_drag (GtkPaned *paned,
GdkEventCrossing *crossing)
/* relative to priv->handle */
int xpos,
int ypos)
{
GtkPanedPrivate *priv = paned->priv;
GtkAllocation allocation;
@ -1528,11 +1530,18 @@ update_drag (GtkPaned *paned,
gint pos;
gint handle_size;
gint size;
gint x, y;
gdk_window_get_position (priv->handle, &x, &y);
gtk_widget_get_allocation (widget, &allocation);
if (priv->orientation == GTK_ORIENTATION_HORIZONTAL)
gtk_widget_get_pointer (widget, &pos, NULL);
{
pos = xpos + x - allocation.x;
}
else
gtk_widget_get_pointer (widget, NULL, &pos);
{
pos = ypos + y - allocation.y;
}
pos -= priv->drag_pos;
@ -1542,7 +1551,6 @@ update_drag (GtkPaned *paned,
"handle-size", &handle_size,
NULL);
gtk_widget_get_allocation (widget, &allocation);
size = allocation.width - pos - handle_size;
}
else
@ -1564,7 +1572,7 @@ gtk_paned_enter (GtkWidget *widget,
GtkPanedPrivate *priv = paned->priv;
if (priv->in_drag)
update_drag (paned, event);
update_drag (paned, event->x, event->y);
else
{
priv->handle_prelit = TRUE;
@ -1586,7 +1594,7 @@ gtk_paned_leave (GtkWidget *widget,
GtkPanedPrivate *priv = paned->priv;
if (priv->in_drag)
update_drag (paned);
update_drag (paned, event->x, event->y);
else
{
priv->handle_prelit = FALSE;
@ -1747,7 +1755,7 @@ gtk_paned_motion (GtkWidget *widget,
if (priv->in_drag)
{
update_drag (paned);
update_drag (paned, event->x, event->y);
return TRUE;
}