summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTimm Bäder <mail@baedert.org>2018-05-27 17:44:31 +0200
committerTimm Bäder <mail@baedert.org>2018-05-27 17:51:51 +0200
commitd638ff3afa7f3ccfebf2d5de23616109742d622b (patch)
tree6f8863a6269d86b3e8b855c42a1a29a52dd6314c
parentc8decbaad0da55877f46db33865d499f25681abc (diff)
downloadgtk+-d638ff3afa7f3ccfebf2d5de23616109742d622b.tar.gz
popover: Fix setting priv->button_pressed in ::event handler
There were two cases in that if/else cascade handling the event_type == GDK_BUTTON_PRESS case, so priv->button_pressed never got set.
-rw-r--r--gtk/gtkpopover.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/gtk/gtkpopover.c b/gtk/gtkpopover.c
index 8d64a6fbe2..ca78db5558 100644
--- a/gtk/gtkpopover.c
+++ b/gtk/gtkpopover.c
@@ -1381,6 +1381,8 @@ gtk_popover_event (GtkWidget *widget,
GtkWidget *toplevel, *focus;
guint keyval;
+ priv->button_pressed = TRUE;
+
if (!gdk_event_get_keyval ((GdkEvent *) event, &keyval))
return GDK_EVENT_PROPAGATE;
@@ -1405,8 +1407,6 @@ gtk_popover_event (GtkWidget *widget,
return GDK_EVENT_PROPAGATE;
}
- else if (gdk_event_get_event_type (event) == GDK_BUTTON_PRESS)
- priv->button_pressed = TRUE;
else if (gdk_event_get_event_type (event) == GDK_BUTTON_RELEASE)
{
GtkAllocation child_alloc;