[gtk] Revert "popover: Fix setting priv->button_pressed in ::event handler"
- From: Carlos Garnacho <carlosg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk] Revert "popover: Fix setting priv->button_pressed in ::event handler"
- Date: Tue, 29 May 2018 12:09:45 +0000 (UTC)
commit 317abed78e8bdb0a77e7acb80e7ffc5fc6372e08
Author: Carlos Garnacho <carlosg gnome org>
Date: Tue May 29 14:03:27 2018 +0200
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.
gtk/gtkpopover.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
---
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;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]