Merge lp:~michael-sheldon/ubuntu-keyboard/fix-1347488 into lp:ubuntu-keyboard

[Michael Sheldon]

Speed up individual backspaces and switch between individual and word backspace based on 3 words having been deleted instead of 3 seconds having passed.

Speed up individual backspaces and switch between individual and word backspace based on 3 words having been deleted instead of 3 seconds having passed.

[lp:~michael-sheldon/ubuntu-keyboard/fix-1347488]

258. By Michael Sheldon on 2015-01-08

Merge from trunk

[Michael Sheldon (michael-sheldon)]

Are there any related MPs required for this MP to build/function as expected? Please list.

 * No

Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)

 * Yes

Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator?

 * Yes

Did you successfully run all tests found in your component's Test Plan (https://wiki.ubuntu.com/Process/Merges/TestPlan/ubuntu-keyboard) on device or emulator?

 * Yes

If you changed the UI, was the change specified/approved by design?

 * No change

If you changed UI labels, did you update the pot file?

 * No change

If you changed the packaging (debian), did you add a core-dev as a reviewer to this MP?

 * No change

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:258
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/529/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-amd64-ci/30
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/30
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/30/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-i386-ci/30

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-keyboard-ci/529/rebuild

review: Approve (continuous-integration)

[Bill Filler (bfiller)]

works much better, nice job

review: Approve

=== modified file 'src/view/abstracttexteditor.cpp'
--- src/view/abstracttexteditor.cpp	2014-12-04 17:44:17 +0000
+++ src/view/abstracttexteditor.cpp	2015-01-08 10:29:34 +0000
@@ -264,7 +264,9 @@
 EditorOptions::EditorOptions()
     : backspace_auto_repeat_delay(500)
     , backspace_auto_repeat_interval(200)
-    , backspace_word_delay(3000)
+    , backspace_auto_repeat_acceleration_rate(10)
+    , backspace_auto_repeat_min_interval(50)
+    , backspace_word_switch_threshold(3)
     , backspace_word_interval(400)
     , backspace_word_acceleration_rate(10)
     , backspace_word_min_interval(50)
@@ -274,7 +276,6 @@
 {
 public:
     QTimer auto_repeat_backspace_timer;
-    QElapsedTimer backspace_hold_timer;
     bool backspace_sent;
     bool repeating_backspace;
     EditorOptions options;
@@ -289,7 +290,9 @@
     bool double_space_full_stop_enabled;
     bool editing_middle_of_text;
     QString appendix_for_previous_preedit;
+    int backspace_acceleration;
     int backspace_word_acceleration;
+    int deleted_words;
     QString keyboardState;
 
     explicit AbstractTextEditorPrivate(const EditorOptions &new_options,
@@ -316,7 +319,9 @@
     , double_space_full_stop_enabled(false)
     , editing_middle_of_text(false)
     , appendix_for_previous_preedit()
+    , backspace_acceleration(0)
     , backspace_word_acceleration(0)
+    , deleted_words(0)
     , keyboardState("CHARACTERS")
 {
     auto_repeat_backspace_timer.setSingleShot(true);
@@ -405,7 +410,7 @@
     if (key.action() == Key::ActionBackspace) {
         d->backspace_sent = false;
         d->auto_repeat_backspace_timer.start(d->options.backspace_auto_repeat_delay);
-        d->backspace_hold_timer.restart();
+        d->deleted_words = 0;
     }
 }
 
@@ -522,6 +527,7 @@
 
         d->auto_repeat_backspace_timer.stop();
         d->repeating_backspace = false;
+        d->backspace_acceleration = 0;
     } break;
 
     case Key::ActionSpace: {
@@ -856,12 +862,18 @@
 
     d->repeating_backspace = true;
 
-    if (d->backspace_hold_timer.elapsed() < d->options.backspace_word_delay) {
+    if (d->deleted_words < d->options.backspace_word_switch_threshold) {
         singleBackspace();
-        d->auto_repeat_backspace_timer.start(d->options.backspace_auto_repeat_interval);
+
+        // Gradually speed up single letter deletion
+        if(d->options.backspace_auto_repeat_interval - d->backspace_acceleration > d->options.backspace_auto_repeat_min_interval) {
+            d->backspace_acceleration += d->options.backspace_auto_repeat_acceleration_rate;
+        }
+        d->auto_repeat_backspace_timer.start(d->options.backspace_auto_repeat_interval - d->backspace_acceleration);
         d->backspace_word_acceleration = 0;
     } else {
         autoRepeatWordBackspace();
+        d->backspace_acceleration = 0;
     }
 }
 
@@ -934,15 +946,17 @@
 void AbstractTextEditor::singleBackspace()
 {
     Q_D(AbstractTextEditor);
-
+    bool in_word = false;
     QString textOnLeft = d->text->surroundingLeft();
 
     if (d->text->preedit().isEmpty()) {
+        in_word = textOnLeft.right(1) != " ";
         sendKeyPressAndReleaseEvents(Qt::Key_Backspace, Qt::NoModifier);
         // Deletion of surrounding text isn't updated in the model until later
         // Update it locally here for autocaps detection
         textOnLeft.chop(1);
     } else {
+        in_word = true;
         d->text->removeFromPreedit(1);
         textOnLeft += d->text->preedit();
         
@@ -962,6 +976,11 @@
         }
     }
 
+    if (in_word && textOnLeft.right(1) == " ") {
+        // We were in a word, but now we're not, so we've just finished deleting a word
+        d->deleted_words++;
+    }
+
     textOnLeft = textOnLeft.trimmed();
 
     const bool auto_caps_activated = d->word_engine->languageFeature()->activateAutoCaps(textOnLeft);

=== modified file 'src/view/abstracttexteditor.h'
--- src/view/abstracttexteditor.h	2014-11-26 15:02:05 +0000
+++ src/view/abstracttexteditor.h	2015-01-08 10:29:34 +0000
@@ -48,7 +48,9 @@
     // all delays are in milliseconds
     int backspace_auto_repeat_delay; // delay before first automatically repeated key
     int backspace_auto_repeat_interval; // interval between automatically repeated keys
-    int backspace_word_delay; // delay before first automatically delete whole words
+    int backspace_auto_repeat_acceleration_rate; // rate at which to accelerate key repetition
+    int backspace_auto_repeat_min_interval; // minimum interval between repeating keys
+    int backspace_word_switch_threshold; // switch to deleting whole words after we've deleted a certain number of words via single backspaces
     int backspace_word_interval; // interval between deleting word on while pressing the backspace
     int backspace_word_acceleration_rate; // rate at which to accelerate word deletion
     int backspace_word_min_interval; // minimum interval between deleting words after acceleration