AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-13 12:20:10 +00:00
Code Issues Projects Releases Wiki Activity

Make GtkTextView deal better with !can_focus

Browse Source 
This was pointed out in
https://bugzilla.gnome.org/show_bug.cgi?id=693050
This commit is contained in:
Matthias Clasen 2013-02-03 15:44:41 -05:00
parent 001f3219e0
commit edd1c66041
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
gtk/gtktextview.c
View File

@ -5218,24 +5218,31 @@ gtk_text_view_focus (GtkWidget *widget,
{
GtkContainer *container;
gboolean result;
container = GTK_CONTAINER (widget);
container = GTK_CONTAINER (widget);
if (!gtk_widget_is_focus (widget) &&
gtk_container_get_focus_child (container) == NULL)
{
gtk_widget_grab_focus (widget);
return TRUE;
if (gtk_widget_get_can_focus (widget))
{
gtk_widget_grab_focus (widget);
return TRUE;
}
return FALSE;
}
else
{
gboolean can_focus;
/*
* Unset CAN_FOCUS flag so that gtk_container_focus() allows
* children to get the focus
*/
can_focus = gtk_widget_get_can_focus (widget);
gtk_widget_set_can_focus (widget, FALSE);
result = GTK_WIDGET_CLASS (gtk_text_view_parent_class)->focus (widget, direction);
gtk_widget_set_can_focus (widget, TRUE);
gtk_widget_set_can_focus (widget, can_focus);
return result;
}