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

gtkpopover: Use event coordinates right away to detect clicks outside.

Browse Source 
There's no need anymore to translate coordinates, the event already contains
popover-relative ones.
This commit is contained in:
Carlos Garnacho 2017-05-12 12:42:48 +02:00
parent 47e505781e
commit ee894903c7
1 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
gtk/gtkpopover.c
View File

@ -1410,31 +1410,21 @@ gtk_popover_button_release (GtkWidget *widget,
GdkEventButton *event)
{
GtkPopover *popover = GTK_POPOVER (widget);
GtkWidget *child, *event_widget;
GtkAllocation child_alloc;
GtkWidget *child;
child = gtk_bin_get_child (GTK_BIN (widget));
if (!popover->priv->button_pressed)
return GDK_EVENT_PROPAGATE;
event_widget = gtk_get_event_widget ((GdkEvent *) event);
gtk_widget_get_allocation (child, &child_alloc);
if (child && event->window == gtk_widget_get_window (widget))
{
GtkAllocation child_alloc;
gtk_widget_get_allocation (child, &child_alloc);
if (event->x < child_alloc.x ||
event->x > child_alloc.x + child_alloc.width ||
event->y < child_alloc.y ||
event->y > child_alloc.y + child_alloc.height)
gtk_popover_popdown (popover);
}
else if (!gtk_widget_is_ancestor (event_widget, widget))
{
gtk_popover_popdown (popover);
}
if (event->x < child_alloc.x ||
event->x > child_alloc.x + child_alloc.width ||
event->y < child_alloc.y ||
event->y > child_alloc.y + child_alloc.height)
gtk_popover_popdown (popover);
return GDK_EVENT_PROPAGATE;
}