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

entrycompletion: Ensure transient_for is set before showing window

Browse Source 
gtk_entry_set_completion() (and _gtk_entry_completion_connect underneath)
may happen when the entry has no toplevel yet. This window acts as the
"parent" for subsurface windows on wayland, and is indispensable to create
its backing wl_subsurface, so this resulted in non-visible popups there.
Fix this by ensuring transient_for is set before showing the popup.

https://bugzilla.gnome.org/show_bug.cgi?id=745463
This commit is contained in:
Carlos Garnacho 2015-03-09 15:15:23 +01:00
parent c352093bde
commit 94ec6b4418
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
gtk/gtkentrycompletion.c
View File

@ -1636,8 +1636,12 @@ gtk_entry_completion_popup (GtkEntryCompletion *completion)
toplevel = gtk_widget_get_toplevel (completion->priv->entry);
if (GTK_IS_WINDOW (toplevel))
gtk_window_group_add_window (gtk_window_get_group (GTK_WINDOW (toplevel)),
GTK_WINDOW (completion->priv->popup_window));
{
gtk_window_set_transient_for (GTK_WINDOW (completion->priv->popup_window),
GTK_WINDOW (toplevel));
gtk_window_group_add_window (gtk_window_get_group (GTK_WINDOW (toplevel)),
GTK_WINDOW (completion->priv->popup_window));
}
/* prevent the first row being focused */
gtk_widget_grab_focus (completion->priv->tree_view);
@ -2711,9 +2715,6 @@ void
_gtk_entry_completion_connect (GtkEntryCompletion *completion,
GtkEntry *entry)
{
GtkEntryCompletionPrivate *priv = completion->priv;
GtkWidget *toplevel;
completion->priv->entry = GTK_WIDGET (entry);
set_accessible_relation (completion->priv->popup_window,
@ -2722,10 +2723,4 @@ _gtk_entry_completion_connect (GtkEntryCompletion *completion,
completion->priv->entry);
connect_completion_signals (completion);
toplevel = gtk_widget_get_toplevel (GTK_WIDGET (entry));
if (gtk_widget_is_toplevel (toplevel))
gtk_window_set_transient_for (GTK_WINDOW (priv->popup_window),
GTK_WINDOW (toplevel));
}