Merge lp:~jeremywootten/pantheon-files/fix-regression-rename-in-listview-does-not-grab-keyboard-focus into lp:~elementary-apps/pantheon-files/trunk

[Jeremy Wootten]

Fix regression caused by r2522

This branch fixes a regression in renaming using list and column view using only keyboard caused by fix recently merged at r2522.

While that fix worked if the name was clicked on to edit, immediately typing in a new name did not work. While the appropriate part of the name appeared selected, the editable widget did not have keyboard focus.

A slightly less simple fix is needed, delaying the selection of the required region until the editable widget (Gtk.Entry) is realized and the start_editing method has been called.

[David Hewitt (davidmhewitt)]

Can confirm this fixes the regression and still works fine for renaming by right clicking and selecting rename.

review: Approve

=== modified file 'src/View/Widgets/SingleLineEditableLabel.vala'
--- src/View/Widgets/SingleLineEditableLabel.vala	2017-03-10 18:19:39 +0000
+++ src/View/Widgets/SingleLineEditableLabel.vala	2017-03-14 17:42:20 +0000
@@ -20,6 +20,8 @@
     public class SingleLineEditableLabel : AbstractEditableLabel {
 
         protected Gtk.Entry textview;
+        private int select_start = 0;
+        private int select_end = 0;
 
         public SingleLineEditableLabel () {}
 
@@ -65,7 +67,11 @@
         /** Gtk.Editable interface */
 
         public override void select_region (int start_pos, int end_pos) {
-            textview.select_region (start_pos, end_pos);
+            /* Cannot select textview region here because it is not realised yet and the selected region
+             * will be overridden when keyboard focus is grabbed after realising. So just remember start and end.
+             */  
+            select_start = start_pos;
+            select_end = end_pos;
         }
 
         public override void do_delete_text (int start_pos, int end_pos) {
@@ -101,6 +107,9 @@
         }
 
         public override void start_editing (Gdk.Event? event) {
+            /* Now realised.  Grab keyboard focus first and then select region */
+            textview.grab_focus ();
+            textview.select_region (select_start, select_end);
         }
     }
 }