Merge lp:~michael-sheldon/oxide/fix-1400372 into lp:~oxide-developers/oxide/oxide.trunk

[Michael Sheldon]

Disables showing the keyboard if the currently focused node isn't editable.

Disables showing the keyboard if the currently focused node isn't editable.

[Olivier Tilloy (osomon)]

The change seems to make sense, however I just tested it on the gmail use case and here’s what I’m seeing:

 1) if I type in a search string and press the enter key, the osk is not dismissed (current behaviour, this hasn’t improved)

 2) I can manually dismiss the keyboard (by swiping it away), and it remains hidden (this has improved, good)

 3) if I now tap on the search field again, it gets focus (the caret is blinking), however the osk doesn’t show up; tapping multiple times doesn’t improve the situation

 4) if I then press the Cancel button and tap on the search field again, the osk shows up again

Step #2 is an improvement, but step #3 looks like a step backward. I think this needs more investigation.

[lp:~michael-sheldon/oxide/fix-1400372]

1016. By Michael Sheldon on 2015-03-27

Check if the keyboard should be shown when focus information is updated

[Olivier Tilloy (osomon)]

This looks good to me now.

One issue remains with gmail: when validating a search by pressing the return key, the text field (apparently) looses focus, but the keyboard is not automatically dismissed.
However the user can manually dismiss it and it won’t re-appear until needed. So that’s definitely an improvement over the current situation.

review: Approve

=== modified file 'qt/core/browser/oxide_qt_web_view.cc'
--- qt/core/browser/oxide_qt_web_view.cc	2015-01-20 21:55:32 +0000
+++ qt/core/browser/oxide_qt_web_view.cc	2015-03-27 17:19:35 +0000
@@ -273,7 +273,7 @@
 
 bool WebView::ShouldShowInputPanel() const {
   if (text_input_type_ != ui::TEXT_INPUT_TYPE_NONE &&
-      show_ime_if_needed_) {
+      show_ime_if_needed_ && focused_node_is_editable_) {
     return true;
   }
 
@@ -705,6 +705,8 @@
 
   if (ShouldHideInputPanel() && HasFocus()) {
     SetInputPanelVisibility(false);
+  } else if (!has_input_method_state_ && ShouldShowInputPanel()) {
+    SetInputPanelVisibility(true);
   } else if (has_input_method_state_ && focused_node_is_editable_) {
     QGuiApplication::inputMethod()->reset();
   }