projects
/
gtk4.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
979a7e8
)
Revert "popover: Fix setting priv->button_pressed in ::event handler"
author
Carlos Garnacho
<carlosg@gnome.org>
Tue, 29 May 2018 12:03:27 +0000
(14:03 +0200)
committer
Carlos Garnacho
<carlosg@gnome.org>
Tue, 29 May 2018 12:03:27 +0000
(14:03 +0200)
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
patch
|
blob
|
history
diff --git
a/gtk/gtkpopover.c
b/gtk/gtkpopover.c
index ca78db5558c10795416141ef8df6ac753d7f6157..8d64a6fbe2bbec39a629aa2ed7b6f1236806de7e 100644
(file)
--- 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;