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

Cosmetic

Browse Source 
Don't call gtk_root_get_focus when we already have
the GtkWindowPrivate struct at hand. And use
gtk_window_set_focus to update the focus, like the
old code did.
This commit is contained in:
Matthias Clasen 2020-10-05 21:53:05 -04:00
parent 38547120b2
commit ac164d240b
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
gtk/gtkwindow.c
View File

@ -5190,17 +5190,17 @@ gtk_window_css_changed (GtkWidget *widget,
} }
} }
/** /*
* _gtk_window_unset_focus_and_default: * _gtk_window_unset_focus_and_default:
* @window: a #GtkWindow * @window: a #GtkWindow
* @widget: a widget inside of @window * @widget: a widget inside of @window
* *
* 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.
**/ */
void void
_gtk_window_unset_focus_and_default (GtkWindow *window, _gtk_window_unset_focus_and_default (GtkWindow *window,
GtkWidget *widget) GtkWidget *widget)
{ {
GtkWindowPrivate *priv = gtk_window_get_instance_private (window); GtkWindowPrivate *priv = gtk_window_get_instance_private (window);
@ -5211,30 +5211,31 @@ _gtk_window_unset_focus_and_default (GtkWindow *window,
g_object_ref (window); g_object_ref (window);
g_object_ref (widget); g_object_ref (widget);
parent = _gtk_widget_get_parent (widget); focus = priv->focus_widget;
focus = gtk_root_get_focus (GTK_ROOT (window));
if (focus && (focus == widget || gtk_widget_is_ancestor (focus, widget))) if (focus && (focus == widget || gtk_widget_is_ancestor (focus, widget)))
{ {
parent = _gtk_widget_get_parent (widget);
while (parent) while (parent)
{ {
if (_gtk_widget_get_visible (parent)) if (_gtk_widget_get_visible (parent))
{ {
gtk_widget_grab_focus (parent); gtk_window_set_focus (window, parent);
break; break;
} }
parent = gtk_widget_get_parent (parent); parent = gtk_widget_get_parent (parent);
} }
} }
child = priv->default_widget; child = priv->default_widget;
while (child && child != widget) while (child && child != widget)
child = _gtk_widget_get_parent (child); child = _gtk_widget_get_parent (child);
if (child == widget) if (child == widget)
gtk_window_set_default_widget (window, NULL); gtk_window_set_default_widget (window, NULL);
g_object_unref (widget); g_object_unref (widget);
g_object_unref (window); g_object_unref (window);
} }