AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

gtkpopover: Roll back properly if presenting the popup fails

Browse Source 
If the popover fails to be shown, it would internally undo visible
and mapped state. If we just proceed as normal, the widget enters
in inconsistent state, and a grab remains issued on the invisible
widget, preventing further input from the input device.
This commit is contained in:
Carlos Garnacho 2020-04-24 23:06:52 +02:00
parent d104efe06e
commit 67e1acd4d7
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gtk/gtkpopover.c
View File

@ -540,7 +540,7 @@ create_popup_layout (GtkPopover *popover)
return layout;
}
static void
static gboolean
present_popup (GtkPopover *popover)
{
GtkPopoverPrivate *priv = gtk_popover_get_instance_private (popover);
@ -553,7 +553,12 @@ present_popup (GtkPopover *popover)
MAX (req.width, 1),
MAX (req.height, 1),
layout))
update_popover_layout (popover, layout);
{
update_popover_layout (popover, layout);
return TRUE;
}
return FALSE;
}
static void
@ -913,7 +918,9 @@ gtk_popover_show (GtkWidget *widget)
_gtk_widget_set_visible_flag (widget, TRUE);
gtk_widget_realize (widget);
present_popup (popover);
if (!present_popup (popover))
return;
gtk_widget_map (widget);
if (priv->autohide)