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

Merge branch 'BUG_popover_focus_new_folder_issue_GTK3' into 'gtk-3-24'

Browse Source 
Fix popovers not restablishing default widget

See merge request GNOME/gtk!1075
This commit is contained in:
Matthias Clasen 2019-09-27 20:17:57 +00:00
commit e58bb02acd
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
gtk/gtkwindow.c
View File

@ -9082,6 +9082,11 @@ gtk_window_style_updated (GtkWidget *widget)
* *
* Checks whether the focus and default widgets of @window are * Checks whether the focus and default widgets of @window are
* @widget or a descendent of @widget, and if so, unset them. * @widget or a descendent of @widget, and if so, unset them.
*
* If @widget is a #GtkPopover then nothing will be done with
* respect to the default widget of @window, the reason being that
* popovers already have specific logic for clearing/restablishing
* the default widget of its enclosing window.
**/ **/
void void
_gtk_window_unset_focus_and_default (GtkWindow *window, _gtk_window_unset_focus_and_default (GtkWindow *window,
@ -9106,15 +9111,18 @@ _gtk_window_unset_focus_and_default (GtkWindow *window,
if (child == widget) if (child == widget)
gtk_window_set_focus (GTK_WINDOW (window), NULL); gtk_window_set_focus (GTK_WINDOW (window), NULL);
} }
child = priv->default_widget;
while (child && child != widget)
child = _gtk_widget_get_parent (child);
if (child == widget)
gtk_window_set_default (window, NULL);
if (!GTK_IS_POPOVER (widget))
{
child = priv->default_widget;
while (child && child != widget)
child = _gtk_widget_get_parent (child);
if (child == widget)
gtk_window_set_default (window, NULL);
}
g_object_unref (widget); g_object_unref (widget);
g_object_unref (window); g_object_unref (window);
} }