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

[Michael Sheldon]

Allow predictive text in URL mode (but disable automatic space insertion)

Allow predictive text in URL mode (but disable automatic space insertion)

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

538. By Michael Sheldon on 2017-02-03

Merge Mir deprecation updates

539. By Michael Sheldon on 2017-02-03

Disable spaces on word ribbon selection, but keep them when pressing the space bar

Unmerged revisions

=== modified file 'src/plugin/inputmethod.cpp'
--- src/plugin/inputmethod.cpp	2016-12-10 01:16:27 +0000
+++ src/plugin/inputmethod.cpp	2017-02-02 16:06:50 +0000
@@ -418,9 +418,9 @@
 {
     Q_D(InputMethod);
 
-    if (d->contentType != FreeTextContentType
+    if (d->contentType != FreeTextContentType && d->contentType != UrlContentType
         && !(d->editor.wordEngine()->languageFeature()->alwaysShowSuggestions()
-             && (d->contentType == UrlContentType || d->contentType == EmailContentType))) {
+             && d->contentType == EmailContentType)) {
         d->wordEngineEnabled = false;
     }
 
 
=== modified file 'src/view/abstracttexteditor.cpp'
--- src/view/abstracttexteditor.cpp	2016-08-18 13:50:14 +0000
+++ src/view/abstracttexteditor.cpp	2017-02-02 16:06:50 +0000
@@ -501,8 +501,8 @@
         }
 
         if (replace_preedit) {
-            if (!textOnRight.isEmpty() && d->editing_middle_of_text) {
-                // Don't insert a space if we are correcting a word in the middle of a sentence
+            if ((!textOnRight.isEmpty() && d->editing_middle_of_text) || d->word_engine->languageFeature()->contentType() == Maliit::UrlContentType) {
+                // Don't insert a space if we are correcting a word in the middle of a sentence or if we're in URL mode
                 space = "";
                 d->look_for_a_double_space = false;
                 d->editing_middle_of_text = false;