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

treeview: Ensure the treeview has the implicit grab before grabbing focus

Browse Source 
The cellrenderer signals might be taking the grab somewhere else, at which
point it's dubious we should attempt to take the keyboard focus into the
treeview.

This concretely breaks popovers triggered from cellrenderer signals on
button press, because the treeview will attempt to grab focus
inconditionally then.

https://bugzilla.gnome.org/show_bug.cgi?id=767468
This commit is contained in:
Carlos Garnacho 2016-06-13 23:44:31 +02:00 committed by Matthias Clasen
parent 51799d41e4
commit e33e23a6d9
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gtk/gtktreeview.c
View File

@ -3050,9 +3050,13 @@ static void
grab_focus_and_unset_draw_keyfocus (GtkTreeView *tree_view)
{
GtkWidget *widget = GTK_WIDGET (tree_view);
GtkWidget *grab_widget = gtk_grab_get_current ();
if (gtk_widget_get_can_focus (widget) && !gtk_widget_has_focus (widget))
if (gtk_widget_get_can_focus (widget) &&
!gtk_widget_has_focus (widget) &&
(!grab_widget || grab_widget == widget))
gtk_widget_grab_focus (widget);
tree_view->priv->draw_keyfocus = 0;
}