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

GtkEntry: Make GtkEntry: gtk_entry_grab_focus_without_selecting () behave like gtk_widget_grab_focus () See merge request GNOME/gtk!1137
2019-10-17 13:05:38 +00:00
parent 3aa9dfe16d ac39847187
commit 0ecebd89bc
1 changed files with 7 additions and 0 deletions
--- a/gtk/gtkentry.c
+++ b/gtk/gtkentry.c
@@ -5039,7 +5039,14 @@ void
 _gtk_entry_grab_focus (GtkEntry  *entry,
                       gboolean   select_all)
 {
+  if (!gtk_widget_get_can_focus (GTK_WIDGET (entry)))
+    return;
+
+  if (!gtk_widget_is_sensitive (GTK_WIDGET (entry)))
+    return;
+
  GTK_WIDGET_CLASS (gtk_entry_parent_class)->grab_focus (GTK_WIDGET (entry));
+
  if (select_all)
    gtk_editable_select_region (GTK_EDITABLE (entry), 0, -1);
 }