Merge lp:~zsombi/ubuntu-ui-toolkit/textinputs-osk-fix into lp:ubuntu-ui-toolkit

[Zsombor Egri]

Text inputs (TextField and TextArea) bring up hidden OSK when focused.

Text inputs (TextField and TextArea) bring up hidden OSK when focused.

[Albert Astals Cid (aacid)]

Looks and works good :-)

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:359
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/796/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/./build=panda,distribution=quantal,flavor=armhf/796/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/./build=pbuilder-master,distribution=quantal,flavor=amd64/796/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/./build=pbuilder-master,distribution=quantal,flavor=i386/796/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/796//rebuild/?

review: Approve (continuous-integration)

=== modified file 'modules/Ubuntu/Components/TextArea.qml'
--- modules/Ubuntu/Components/TextArea.qml	2013-02-13 15:40:45 +0000
+++ modules/Ubuntu/Components/TextArea.qml	2013-02-15 09:29:57 +0000
@@ -658,6 +658,15 @@
         editor.undo();
     }
 
+    /*!
+      \internal
+       Ensure focus propagation
+    */
+    function forceActiveFocus()
+    {
+        internal.activateEditor();
+    }
+
     // logic
     /*!\internal - to remove warnings */
     Component.onCompleted: {
@@ -733,12 +742,16 @@
         function activateEditor()
         {
             if (!control.activeFocus)
-                control.forceActiveFocus();
+                editor.forceActiveFocus();
+            else
+                showInputPanel();
+
         }
 
         function showInputPanel()
         {
-            Qt.inputMethod.show();
+            if (!Qt.inputMethod.visible)
+                Qt.inputMethod.show();
         }
         function hideInputPanel()
         {

=== modified file 'modules/Ubuntu/Components/TextField.qml'
--- modules/Ubuntu/Components/TextField.qml	2013-02-13 17:05:27 +0000
+++ modules/Ubuntu/Components/TextField.qml	2013-02-15 09:29:57 +0000
@@ -394,7 +394,7 @@
     */
     function forceActiveFocus()
     {
-        editor.forceActiveFocus();
+        internal.activateEditor();
     }
 
     // internals
@@ -411,7 +411,7 @@
         anchors.fill: parent
         // us it only when there is space between the frame and input
         enabled: internal.spacing > 0
-        onClicked: editor.forceActiveFocus()
+        onClicked: internal.activateEditor()
     }
 
     Text { id: fontHolder }
@@ -435,7 +435,9 @@
         function activateEditor()
         {
             if (!control.activeFocus)
-                control.forceActiveFocus();
+                editor.forceActiveFocus();
+            else
+                showInputPanel();
         }
 
         function showInputPanel()
@@ -443,7 +445,8 @@
             if (control.customSoftwareInputPanel != undefined) {
                 // TODO implement once we have the SIP ready
             } else {
-                Qt.inputMethod.show();
+                if (!Qt.inputMethod.visible)
+                    Qt.inputMethod.show();
             }
             textChanged = false;
         }
@@ -649,6 +652,7 @@
                 // don't do anything while the control is inactive
                 if (!control.activeFocus || (pressedButtons != Qt.LeftButton))
                     return;
+                internal.activateEditor();
                 if (internal.selectionEnd == internal.selectionStart) {
                     internal.resetEditorSelection(mouse.x);
                     internal.selectionMode = true;