Merge lp:~ken-vandine/ubuntu-ui-toolkit/raring.0.1.43 into lp:ubuntu-ui-toolkit/raring

[Ken VanDine]

  * 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. (LP: #1164634)
  * Fixing disabled text input delegate background color theming when userValue
    is set to TextField or TextArea color property. (LP: #1169601)
  * Workaround for TextArea and TextField removing OSK when active focus is
    transferred from one instance to another using focus property (LP: #1163371)
  * Fix for TextArea Enter/Return keys being stolen when embedded in
    ListItems.Empty. (LP: #1166840)

cherrypicked important bug fixes from trunk that are safe to upload to raring and prepared an update for raring.

[Timo Jyrinki (timo-jyrinki)]

Merged.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-04-12 12:04:33 +0000
+++ debian/changelog	2013-04-18 14:13:29 +0000
@@ -1,3 +1,17 @@
+ubuntu-ui-toolkit (0.1.43) UNRELEASED; urgency=low
+
+  * 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. (LP: #1164634)
+  * Fixing disabled text input delegate background color theming when userValue
+    is set to TextField or TextArea color property. (LP: #1169601)
+  * Workaround for TextArea and TextField removing OSK when active focus is 
+    transferred from one instance to another using focus property (LP: #1163371)
+  * Fix for TextArea Enter/Return keys being stolen when embedded in 
+    ListItems.Empty. (LP: #1166840)
+
+ -- Ken VanDine <[e-mail]>  Thu, 18 Apr 2013 10:01:45 -0400
+
 ubuntu-ui-toolkit (0.1.42) raring; urgency=low
 
   [ Loïc Minier ]

=== modified file 'demos/ListItems.qml'
--- demos/ListItems.qml	2013-03-25 20:01:52 +0000
+++ demos/ListItems.qml	2013-04-18 14:13:29 +0000
@@ -356,6 +356,15 @@
                             }
                         }
                     }
+                    ListItem.Empty {
+                        TextArea {
+                            text: i18n.tr("text")
+                            anchors {
+                                margins: units.gu(1)
+                                fill: parent
+                            }
+                        }
+                    }
                 }
             }
             FadingRectangle {

=== modified file 'modules/Ubuntu/Components/TextArea.qml'
--- modules/Ubuntu/Components/TextArea.qml	2013-03-13 15:11:28 +0000
+++ modules/Ubuntu/Components/TextArea.qml	2013-04-18 14:13:29 +0000
@@ -795,6 +795,23 @@
         }
     }
 
+    // grab Enter/Return keys which may be stolen from parent components of TextArea
+    // due to forwarded keys from TextEdit
+    Keys.onPressed: {
+        if ((event.key === Qt.Key_Enter) || (event.key === Qt.Key_Return)) {
+            if (editor.textFormat === TextEdit.RichText) {
+                // FIXME: use control.paste("<br />") instead when paste() gets sich text support
+                editor.insert(editor.cursorPosition, "<br />");
+            } else {
+                control.paste("\n");
+            }
+            event.accepted = true;
+        } else {
+            event.accepted = false;
+        }
+    }
+    Keys.onReleased: event.accepted = (event.key === Qt.Key_Enter) || (event.key === Qt.Key_Return)
+
     // cursor is FIXME: move in a separate element and align with TextField
     Component {
         id: cursor
@@ -902,16 +919,6 @@
             // autosize handling
             onLineCountChanged: internal.frameSize()
 
-            // virtual keyboard handling
-            activeFocusOnPress: false
-            onActiveFocusChanged: {
-                if (activeFocus) {
-                    internal.showInputPanel();
-                } else {
-                    internal.hideInputPanel();
-                }
-            }
-
             // 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-03-27 08:15:42 +0000
+++ modules/Ubuntu/Components/TextField.qml	2013-04-18 14:13:29 +0000
@@ -617,16 +617,6 @@
         // forward keys to the root element so it can be captured outside of it
         Keys.forwardTo: [control]
 
-        // virtual keyboard/software input panel handling
-        activeFocusOnPress: false
-        onActiveFocusChanged: {
-            if (activeFocus) {
-                internal.showInputPanel();
-            } else {
-                internal.hideInputPanel();
-            }
-        }
-
         // 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 14:13:29 +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 14:13:29 +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-02-13 09:36:45 +0000
+++ tests/unit/tst_components/tst_textarea.qml	2013-04-18 14:13:29 +0000
@@ -17,10 +17,13 @@
 import QtQuick 2.0
 import QtTest 1.0
 import Ubuntu.Components 0.1
+import Ubuntu.Components.ListItems 0.1 as ListItem
 
 Item {
     width: 200; height: 200
 
+    property bool hasOSK: QuickUtils.inputMethodProvider !== ""
+
     TextArea {
         id: textArea
         SignalSpy {
@@ -34,10 +37,45 @@
         Keys.onReleased: keyReleaseData = event.key
     }
 
+    TextArea {
+        id: colorTest
+        color: colorTest.text.length < 4 ? "#0000ff" : "#00ff00"
+    }
+
     TextEdit {
         id: textEdit
     }
 
+    ListItem.Empty {
+        id: listItem
+        height: 200
+        anchors.left: parent.left
+
+        anchors.right: parent.right
+        SignalSpy {
+            id: listItemSpy
+            signalName: "clicked"
+            target: listItem
+        }
+
+        TextArea {
+            id: input
+            anchors.fill: parent
+            Component.onCompleted: forceActiveFocus()
+        }
+    }
+
+    Item {
+        TextArea {
+            id: t1
+            objectName: "t1"
+        }
+        TextArea {
+            id: t2
+            objectName: "t2"
+        }
+    }
+
     TestCase {
         name: "TextAreaAPI"
         when: windowShown
@@ -335,9 +373,93 @@
             textArea.readOnly = false;
             textArea.keyPressData = 0;
             textArea.keyReleaseData = 0;
-            keyClick(Qt.Key_Control, Qt.NoModifier, 100);
-            compare(textArea.keyPressData, Qt.Key_Control, "Key press filtered");
-            compare(textArea.keyReleaseData, Qt.Key_Control, "Key release filtered");
+            keyClick(Qt.Key_T, Qt.NoModifier, 100);
+            compare(textArea.keyPressData, Qt.Key_T, "Key press filtered");
+            compare(textArea.keyReleaseData, Qt.Key_T, "Key release filtered");
+        }
+
+        function test_TextAreaInListItem_EnterCaptured() {
+            input.forceActiveFocus();
+            input.textFormat = TextEdit.PlainText;
+            input.text = "";
+            keyClick(Qt.Key_T);
+            keyClick(Qt.Key_E);
+            keyClick(Qt.Key_S);
+            keyClick(Qt.Key_T);
+            keyClick(Qt.Key_Enter);
+            compare(input.text, "test\n", "Keys");
+        }
+        function test_TextAreaInListItem_EnterDoesNotProduceClick() {
+            input.forceActiveFocus();
+            input.textFormat = TextEdit.PlainText;
+            input.text = "";
+            listItemSpy.clear();
+            keyClick(Qt.Key_Enter);
+            tryCompare(listItemSpy, "count", 0, 100);
+        }
+
+        function test_colorCollisionOnDelegate() {
+            // fixes bug lp:1169601
+            colorTest.text = "abc";
+            compare(colorTest.color, "#0000ff", "Color when text length < 4");
+            colorTest.text = "abcd";
+            compare(colorTest.color, "#00ff00", "Color when text length >= 4");
+        }
+
+        function test_OneActiveFocus() {
+            t1.focus = true;
+            compare(t1.activeFocus, true, "T1 has activeFocus");
+            compare(t2.activeFocus, false, "T1 has activeFocus");
+            t2.focus = true;
+            compare(t1.activeFocus, false, "T1 has activeFocus");
+            compare(t2.activeFocus, true, "T1 has activeFocus");
+        }
+
+        function test_OSK_ShownWhenNextTextAreaIsFocused() {
+            if (!hasOSK)
+                expectFail("", "OSK can be tested only when present");
+            t1.focus = true;
+            compare(Qt.inputMethod.visible, true, "OSK is shown for the first TextArea");
+            t2.focus = true;
+            compare(Qt.inputMethod.visible, true, "OSK is shown for the second TextArea");
+        }
+
+        function test_RemoveOSKWhenFocusLost() {
+            if (!hasOSK)
+                expectFail("", "OSK can be tested only when present");
+            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";
+            textArea.textFormat = TextEdit.RichText;
+            input.forceActiveFocus();
+            input.textFormat = TextEdit.RichText;
+            input.text = "ab";
+            input.cursorPosition = 1;
+            keyClick(Qt.Key_Return);
+            compare(input.text, textArea.text, "Formatted text split");
         }
     }
 }

=== modified file 'tests/unit/tst_components/tst_textfield.qml'
--- tests/unit/tst_components/tst_textfield.qml	2013-02-13 10:52:46 +0000
+++ tests/unit/tst_components/tst_textfield.qml	2013-04-18 14:13:29 +0000
@@ -21,23 +21,47 @@
 Item {
     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
-        }
-
         function initTestCase() {
             textField.forceActiveFocus();
             compare(textField.focus, true, "TextField is focused");
@@ -195,6 +219,59 @@
             compare(textField.text, "test text", "Data pasted");
         }
 
+        function test_colorCollisionOnDelegate() {
+            // fixes bug lp:1169601
+            colorTest.text = "abc";
+            compare(colorTest.color, "#0000ff", "Color when text length < 4");
+            colorTest.text = "abcd";
+            compare(colorTest.color, "#00ff00", "Color when text length >= 4");
+        }
+
+        function test_OneActiveFocus() {
+            t1.focus = true;
+            compare(t1.activeFocus, true, "T1 has activeFocus");
+            compare(t2.activeFocus, false, "T1 has activeFocus");
+            t2.focus = true;
+            compare(t1.activeFocus, false, "T1 has activeFocus");
+            compare(t2.activeFocus, true, "T1 has activeFocus");
+        }
+
+        // need to make the very first test case, otherwise OSK detection fails on phablet
+        function test_zz_OSK_ShownWhenNextTextFieldIsFocused() {
+            if (!hasOSK)
+                expectFail("", "OSK can be tested only when present");
+            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_zz_RemoveOSKWhenFocusLost() {
+            if (!hasOSK)
+                expectFail("", "OSK can be tested only when present");
+            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]*/

=== modified file 'themes/Ambiance/qmltheme/TextAreaDelegate.qml'
--- themes/Ambiance/qmltheme/TextAreaDelegate.qml	2013-03-27 07:51:04 +0000
+++ themes/Ambiance/qmltheme/TextAreaDelegate.qml	2013-04-18 14:13:29 +0000
@@ -18,15 +18,16 @@
 import Ubuntu.Components 0.1
 
 // frame
-UbuntuShape {
-    id: shape
-
+Item {
+    id: visuals
     // style properties
-    /*!
-      Background fill color
-      */
     // FIXME: needs type checking in themes to define the proper type to be used
     // if color type is used, alpha value gets lost
+
+    property color color
+    /*!
+      Background fill color
+      */
     property color backgroundColor: Qt.rgba(0, 0, 0, 0.1)
     property color errorColor: "red"
     property real backgroundOpacity
@@ -37,27 +38,31 @@
     property var frameSpacing
     property real overlaySpacing
 
-    // visuals
-    z: -1
-    property bool error: (item.hasOwnProperty("errorHighlight") && item.errorHighlight && !item.acceptableInput)
-    onErrorChanged: color = (error) ? errorColor : backgroundColor;
-    color: backgroundColor
     anchors.fill: parent
-    opacity: backgroundOpacity
-
-    MouseArea {
-        anchors.fill: parent
-        onPressed: if (!item.activeFocus && item.activeFocusOnPress) item.forceActiveFocus()
-    }
 
     Binding {
         target: item.__internal
         property: "frameSpacing"
-        value: shape.frameSpacing
+        value: visuals.frameSpacing
     }
     Binding {
         target: item.__internal
         property: "spacing"
-        value: overlaySpacing
+        value: visuals.overlaySpacing
+    }
+
+    z: -1
+    UbuntuShape {
+        id: shape
+        property bool error: (item.hasOwnProperty("errorHighlight") && item.errorHighlight && !item.acceptableInput)
+        onErrorChanged: (error) ? visuals.errorColor : visuals.backgroundColor;
+        color: visuals.backgroundColor;
+        anchors.fill: parent
+        opacity: visuals.backgroundOpacity
+
+        MouseArea {
+            anchors.fill: parent
+            onPressed: if (!item.activeFocus && item.activeFocusOnPress) item.forceActiveFocus()
+        }
     }
 }