From: Carlos Garnacho <carlosg@gnome.org>
Date: Tue, 29 May 2018 12:03:27 +0000 (+0200)
Subject: Revert "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~230
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=317abed78e8bdb0a77e7acb80e7ffc5fc6372e08;p=gtk4.git

Revert "popover: Fix setting priv->button_pressed in ::event handler"

This reverts commit d638ff3afa7f3ccfebf2d5de23616109742d622b.

Doesn't look like the right fix. Another one coming that fixes dismissing
through both pointer and keyboard.
---

diff --git a/gtk/gtkpopover.c b/gtk/gtkpopover.c
index ca78db5558..8d64a6fbe2 100644
--- a/gtk/gtkpopover.c
+++ b/gtk/gtkpopover.c
@@ -1381,8 +1381,6 @@ 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;
 
@@ -1407,6 +1405,8 @@ 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;