From: Timm Bäder <mail@baedert.org>
Date: Sun, 27 May 2018 15:44:31 +0000 (+0200)
Subject: popover: Fix setting priv->button_pressed in ::event handler
X-Git-Tag: archive/raspbian/4.4.1+ds1-2+rpi1^2~18^2~22^2~232
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=d638ff3afa7f3ccfebf2d5de23616109742d622b;p=gtk4.git

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.
---

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;