Merge lp:~jeremywootten/pantheon-files/fix-1659353-select-Chinese into lp:~elementary-apps/pantheon-files/trunk

[Jeremy Wootten]

Do not trap Down and Up keys in pathbar; only exit rename with unmodified Enter

This branch stops the BreadcrumbsEntry trapping the unmodified down and up keys as these key is used to move down the list of choices of Chinese/Japanese characters in certain input methods.

It was also noticed that there is a problem with renaming using Chinese/Japanese input methods - pressing Enter when selecting a choice of characters causes rename to end without entering the character. It appears that the input method reacts to the character but does not trap it. To ameliorate this, the editable widget now only ends rename with unmodified Enter, allowing Ctrl-Enter to be used to enter the Chinese/Japanese character, at least when tested using the fcitx/mozc Japanese input method.

=== modified file 'libwidgets/Chrome/BasicBreadcrumbsEntry.vala'
--- libwidgets/Chrome/BasicBreadcrumbsEntry.vala	2016-12-26 17:17:11 +0000
+++ libwidgets/Chrome/BasicBreadcrumbsEntry.vala	2017-01-27 11:01:54 +0000
@@ -185,15 +185,24 @@
             bool only_control_pressed = (mods == Gdk.ModifierType.CONTROL_MASK);
 
             switch (event.keyval) {
+                /* Do not trap unmodified Down and Up keys - used by some input methods */
                 case Gdk.Key.KP_Down:
                 case Gdk.Key.Down:
-                    go_down ();
-                    return true;
+                    if (only_control_pressed) {
+                        go_down ();
+                        return true;
+                    }
+
+                    break;
 
                 case Gdk.Key.KP_Up:
                 case Gdk.Key.Up:
-                    go_up ();
-                    return true;
+                    if (only_control_pressed) {
+                        go_up ();
+                        return true;
+                    }
+
+                    break;
 
                 case Gdk.Key.Escape:
                     activate_path ("");
 
=== modified file 'src/View/Widgets/AbstractEditableLabel.vala'
--- src/View/Widgets/AbstractEditableLabel.vala	2016-12-31 19:42:09 +0000
+++ src/View/Widgets/AbstractEditableLabel.vala	2017-01-27 11:01:54 +0000
@@ -36,13 +36,22 @@
         }
 
         public bool on_key_press_event (Gdk.EventKey event) {
-            bool control_pressed = ((event.state & Gdk.ModifierType.CONTROL_MASK) != 0);
+            var mods = event.state & Gtk.accelerator_get_default_mod_mask ();
+            bool only_control_pressed = (mods == Gdk.ModifierType.CONTROL_MASK);
+
             switch (event.keyval) {
                 case Gdk.Key.Return:
                 case Gdk.Key.KP_Enter:
-                    editing_canceled = false;
-                    remove_widget (); /* also causes edited signal to be emitted by CellRenderer */
-                    return true;
+                    /*  Only end rename with unmodified Enter. This is to allow use of Ctrl-Enter
+                     *  to commit Chinese/Japanese characters when using some input methods, without ending rename.
+                     */ 
+                    if (mods == 0) {
+                        editing_canceled = false;
+                        remove_widget (); /* also causes edited signal to be emitted by CellRenderer */
+                        return true;
+                    }
+
+                    break;
 
                 case Gdk.Key.Escape:
                     editing_canceled = true;
@@ -50,7 +59,8 @@
                     return true;
 
                 case Gdk.Key.z:
-                    if (control_pressed) {
+                    /* Undo with Ctrl-Z only */
+                    if (only_control_pressed) {
                         set_text (original_name);
                         return true;
                     }