Merge lp:~zsombi/ubuntu-ui-toolkit/textinputs-stay-disabled-when-reenabled into lp:ubuntu-ui-toolkit

[Zsombor Egri]

Fix for text inputs staying disabled after being re-enabled. The previous workaround for removing input panel was blocking re-enabling a previously enabled input.

[PS Jenkins bot (ps-jenkins)]

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

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-ui-toolkit-ci/1039/rebuild

review: Approve (continuous-integration)

[Florian Boucault (fboucault)]

How about using http://qt-project.org/doc/qt-5.0/qtcore/qobject.html#inherits instead of qobject_cast?
It seems more adapted to the purpose of the checks in QuickUtils::activeFocus.
Feel free to ignore this comment.

[PS Jenkins bot (ps-jenkins)]

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

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-ui-toolkit-ci/1040/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'modules/Ubuntu/Components/TextArea.qml'
--- modules/Ubuntu/Components/TextArea.qml	2013-04-17 16:19:42 +0000
+++ modules/Ubuntu/Components/TextArea.qml	2013-04-18 12:28:28 +0000
@@ -919,24 +919,6 @@
             // autosize handling
             onLineCountChanged: internal.frameSize()
 
-            // FIXME: workaround for bug https://bugreports.qt-project.org/browse/QTBUG-30729
-            // input panel does not get removed when no active input is active
-            activeFocusOnPress: false
-            onActiveFocusChanged: {
-                if (activeFocus) {
-                    internal.showInputPanel();
-                } else {
-                    internal.hideInputPanel();
-                }
-            }
-            // watch inputMethod's visible change to be able to open input panel back
-            // removed by a previous active focus being deactivated
-            // workaround for bug https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1163371
-            Connections {
-                target: Qt.inputMethod
-                onVisibleChanged: if (editor.activeFocus) internal.showInputPanel();
-            }
-
             // remove selection when typing starts or input method start entering text
             onInputMethodComposingChanged: {
                 if (inputMethodComposing)

=== modified file 'modules/Ubuntu/Components/TextField.qml'
--- modules/Ubuntu/Components/TextField.qml	2013-04-17 16:19:42 +0000
+++ modules/Ubuntu/Components/TextField.qml	2013-04-18 12:28:28 +0000
@@ -617,24 +617,6 @@
         // forward keys to the root element so it can be captured outside of it
         Keys.forwardTo: [control]
 
-        // FIXME: workaround for bug https://bugreports.qt-project.org/browse/QTBUG-30729
-        // input panel does not get removed when no active input is active
-        activeFocusOnPress: false
-        onActiveFocusChanged: {
-            if (activeFocus) {
-                internal.showInputPanel();
-            } else {
-                internal.hideInputPanel();
-            }
-        }
-        // watch inputMethod's visible change to be able to open input panel back
-        // removed by a previous active focus being deactivated
-        // workaround for bug https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1163371
-        Connections {
-            target: Qt.inputMethod
-            onVisibleChanged: if (editor.activeFocus) internal.showInputPanel()
-        }
-
         // handle virtual keyboard and cursor positioning, as the MouseArea overrides
         // those functionalities of the TextInput
         MouseArea {

=== modified file 'modules/Ubuntu/Components/plugin/quickutils.cpp'
--- modules/Ubuntu/Components/plugin/quickutils.cpp	2013-03-07 12:40:45 +0000
+++ modules/Ubuntu/Components/plugin/quickutils.cpp	2013-04-18 12:28:28 +0000
@@ -25,10 +25,15 @@
 #include <QtCore/QAbstractProxyModel>
 #include <QtQml/QQmlPropertyMap>
 
+#include <private/qquicktextinput_p.h>
+#include <private/qquicktextedit_p.h>
+
 QuickUtils::QuickUtils(QObject *parent) :
     QObject(parent)
 {
     QGuiApplication::instance()->installEventFilter(this);
+    // connect to focusObjectChanged() to get the latest active focus object
+    QObject::connect(QGuiApplication::instance(), SIGNAL(focusObjectChanged(QObject*)), this, SLOT(activeFocus(QObject*)));
 }
 
 /*!
@@ -45,6 +50,23 @@
     return QObject::eventFilter(obj, event);
 }
 
+/*!
+ * \internal
+ * Catch active focus object change to detecte whether we need to remove OSK or not.
+ */
+void QuickUtils::activeFocus(QObject *active)
+{
+    // FIXME: workaround for bug https://bugreports.qt-project.org/browse/QTBUG-30729
+    // input panel does not get removed when no input is active
+    // remove input panel if there's no more active object or the new active object
+    // is not a text input
+    // workaround for bug https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1163371
+    if (QGuiApplication::inputMethod()->isVisible() && (!active || (active &&
+                    !qobject_cast<QQuickTextInput*>(active) &&
+                    !qobject_cast<QQuickTextEdit*>(active)))) {
+        QGuiApplication::inputMethod()->hide();
+    }
+}
 
 /*!
  * \internal
@@ -57,6 +79,12 @@
     return (m_rootView) ? m_rootView->rootObject() : 0;
 }
 
+QString QuickUtils::inputMethodProvider() const
+{
+    return QString(getenv("QT_IM_MODULE"));
+}
+
+
 /*!
  * \internal
  * Creates an instance out of a delegate using the roles specified in the

=== modified file 'modules/Ubuntu/Components/plugin/quickutils.h'
--- modules/Ubuntu/Components/plugin/quickutils.h	2013-03-07 12:40:45 +0000
+++ modules/Ubuntu/Components/plugin/quickutils.h	2013-04-18 12:28:28 +0000
@@ -29,6 +29,7 @@
 {
     Q_OBJECT
     Q_PROPERTY(QQuickItem *rootObject READ rootObject NOTIFY rootObjectChanged)
+    Q_PROPERTY(QString inputMethodProvider READ inputMethodProvider)
 public:
     static QuickUtils& instance()
     {
@@ -37,6 +38,7 @@
     }
 
     QQuickItem *rootObject();
+    QString inputMethodProvider() const;
 
     Q_INVOKABLE qreal modelDelegateHeight(QQmlComponent *delegate, const QVariant &model);
     Q_INVOKABLE QString className(QQuickItem *item);
@@ -47,6 +49,9 @@
 protected:
     bool eventFilter(QObject *, QEvent *);
 
+private Q_SLOTS:
+    void activeFocus(QObject*);
+
 private:
     explicit QuickUtils(QObject *parent = 0);
     QQuickView *m_rootView;

=== modified file 'tests/unit/tst_components/tst_textarea.qml'
--- tests/unit/tst_components/tst_textarea.qml	2013-04-18 12:28:28 +0000
+++ tests/unit/tst_components/tst_textarea.qml	2013-04-18 12:28:28 +0000
@@ -22,6 +22,8 @@
 Item {
     width: 200; height: 200
 
+    property bool hasOSK: QuickUtils.inputMethodProvider !== ""
+
     TextArea {
         id: textArea
         SignalSpy {
@@ -414,12 +416,8 @@
         }
 
         function test_OSK_ShownWhenNextTextAreaIsFocused() {
-            // detect whether we have OSK support
-            Qt.inputMethod.show();
-            if (!Qt.inputMethod.visible)
+            if (!hasOSK)
                 expectFail("", "OSK can be tested only when present");
-            else
-                Qt.inputMethod.hide();
             t1.focus = true;
             compare(Qt.inputMethod.visible, true, "OSK is shown for the first TextArea");
             t2.focus = true;
@@ -427,18 +425,31 @@
         }
 
         function test_RemoveOSKWhenFocusLost() {
-            // detect whether we have OSK support
-            Qt.inputMethod.show();
-            if (!Qt.inputMethod.visible)
+            if (!hasOSK)
                 expectFail("", "OSK can be tested only when present");
-            else
-                Qt.inputMethod.hide();
             t1.focus = true;
             compare(Qt.inputMethod.visible, true, "OSK is shown when TextArea gains focus");
             t1.focus = false;
             compare(Qt.inputMethod.visible, false, "OSK is hidden when TextArea looses focus");
         }
 
+        function test_ReEnabledInput() {
+            textArea.forceActiveFocus();
+            textArea.enabled = false;
+            compare(textArea.enabled, false, "textArea is disabled");
+            compare(textArea.focus, true, "textArea is focused");
+            compare(textArea.activeFocus, false, "textArea is not active focus");
+            compare(Qt.inputMethod.visible, false, "OSK removed");
+
+            textArea.enabled = true;
+            compare(textArea.enabled, true, "textArea is enabled");
+            compare(textArea.focus, true, "textArea is focused");
+            compare(textArea.activeFocus, true, "textArea is active focus");
+            if (!hasOSK)
+                expectFail("", "OSK can be tested only when present");
+            compare(Qt.inputMethod.visible, true, "OSK shown");
+        }
+
         // make it to b ethe last test case executed
         function test_zz_TextareaInListItem_RichTextEnterCaptured() {
             textArea.text = "a<br />b";

=== modified file 'tests/unit/tst_components/tst_textfield.qml'
--- tests/unit/tst_components/tst_textfield.qml	2013-04-18 12:28:28 +0000
+++ tests/unit/tst_components/tst_textfield.qml	2013-04-18 12:28:28 +0000
@@ -22,37 +22,46 @@
     id: textItem
     width: 200; height: 200
 
+    property bool hasOSK: QuickUtils.inputMethodProvider !== ""
+
+    function reset() {
+        colorTest.focus = false;
+        textField.focus = false;
+        t1.focus = false;
+        t2.focus = false;
+    }
+
     TextField {
         id: colorTest
         color: colorTest.text.length < 4 ? "#0000ff" : "#00ff00"
     }
 
+    TextField {
+        id: textField
+        SignalSpy {
+            id: signalSpy
+            target: parent
+        }
+
+        property int keyPressData
+        property int keyReleaseData
+        Keys.onPressed: keyPressData = event.key
+        Keys.onReleased: keyReleaseData = event.key
+    }
+
+    Item {
+        TextField {
+            id: t1
+        }
+        TextField {
+            id: t2
+        }
+    }
+
     TestCase {
         name: "TextFieldAPI"
         when: windowShown
 
-        TextField {
-            id: textField
-            SignalSpy {
-                id: signalSpy
-                target: parent
-            }
-
-            property int keyPressData
-            property int keyReleaseData
-            Keys.onPressed: keyPressData = event.key
-            Keys.onReleased: keyReleaseData = event.key
-        }
-
-        Item {
-            TextField {
-                id: t1
-            }
-            TextField {
-                id: t2
-            }
-        }
-
         function initTestCase() {
             textField.forceActiveFocus();
             compare(textField.focus, true, "TextField is focused");
@@ -228,32 +237,41 @@
         }
 
         // need to make the very first test case, otherwise OSK detection fails on phablet
-        function test_00_OSK_ShownWhenNextTextFieldIsFocused() {
-            // detect whether we have OSK support
-            Qt.inputMethod.show();
-            if (!Qt.inputMethod.visible)
+        function test_zz_OSK_ShownWhenNextTextFieldIsFocused() {
+            if (!hasOSK)
                 expectFail("", "OSK can be tested only when present");
-            else
-                Qt.inputMethod.hide();
             t1.focus = true;
             compare(Qt.inputMethod.visible, true, "OSK is shown for the first TextField");
             t2.focus = true;
             compare(Qt.inputMethod.visible, true, "OSK is shown for the second TextField");
         }
 
-        function test_RemoveOSKWhenFocusLost() {
-            // detect whether we have OSK support
-            Qt.inputMethod.show();
-            if (!Qt.inputMethod.visible)
+        function test_zz_RemoveOSKWhenFocusLost() {
+            if (!hasOSK)
                 expectFail("", "OSK can be tested only when present");
-            else
-                Qt.inputMethod.hide();
             t1.focus = true;
             compare(Qt.inputMethod.visible, true, "OSK is shown when TextField gains focus");
             t1.focus = false;
             compare(Qt.inputMethod.visible, false, "OSK is hidden when TextField looses focus");
         }
 
+        function test_zz_ReEnabledInput() {
+            textField.forceActiveFocus();
+            textField.enabled = false;
+            compare(textField.enabled, false, "textField is disabled");
+            compare(textField.focus, true, "textField is focused");
+            compare(textField.activeFocus, false, "textField is not active focus");
+            compare(Qt.inputMethod.visible, false, "OSK removed");
+
+            textField.enabled = true;
+            compare(textField.enabled, true, "textField is enabled");
+            compare(textField.focus, true, "textField is focused");
+            compare(textField.activeFocus, true, "textField is active focus");
+            if (!hasOSK)
+                expectFail("", "OSK can be tested only when present");
+            compare(Qt.inputMethod.visible, true, "OSK shown");
+        }
+
         RegExpValidator {
             id: regExpValidator
             regExp: /[a-z]*/