Merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/focusOnTab into lp:ubuntu-ui-toolkit/staging

[Cris Dywan]

Enable (Shift)Tab via activeFocusOnTab

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1573
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2066/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/794
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/796
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/796/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/793

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2066/rebuild

review: Approve (continuous-integration)

[Zsombor Egri (zsombi)]

A small comment inline.

review: Needs Information

[lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/focusOnTab]

1574. By Cris Dywan on 2015-07-29

Use setter for setActiveFocusOnTab

[Zsombor Egri (zsombi)]

Good to go now! Thanks!!!

review: Approve

=== modified file 'src/Ubuntu/Components/1.3/TextArea.qml'
--- src/Ubuntu/Components/1.3/TextArea.qml	2015-05-22 14:06:03 +0000
+++ src/Ubuntu/Components/1.3/TextArea.qml	2015-07-29 11:41:48 +0000
@@ -178,13 +178,6 @@
 
     // forwarded properties
     /*!
-      Whether the TextArea should gain active focus on a mouse press. By default this
-      is set to true.
-      \qmlproperty bool activeFocusOnPress
-      */
-    property alias activeFocusOnPress: editor.activeFocusOnPress
-
-    /*!
       This property specifies a base URL which is used to resolve relative URLs within
       the text. The default value is the url of the QML file instantiating the TextArea
       item.
@@ -757,6 +750,7 @@
     //internals
 
     opacity: enabled ? 1.0 : 0.3
+    activeFocusOnPress: true
 
     /*!\internal */
     onVisibleChanged: {
@@ -863,7 +857,7 @@
             wrapMode: TextEdit.WrapAtWordBoundaryOrAnywhere
             mouseSelectionMode: TextEdit.SelectWords
             selectByMouse: true
-            activeFocusOnPress: true
+            activeFocusOnPress: control.activeFocusOnPress
             onActiveFocusChanged: if (!activeFocus && inputHandler.popover) PopupUtils.close(inputHandler.popover)
             cursorDelegate: TextCursor {
                 handler: inputHandler

=== modified file 'src/Ubuntu/Components/1.3/TextField.qml'
--- src/Ubuntu/Components/1.3/TextField.qml	2015-05-22 14:06:03 +0000
+++ src/Ubuntu/Components/1.3/TextField.qml	2015-07-29 11:41:48 +0000
@@ -172,13 +172,6 @@
     property alias acceptableInput: editor.acceptableInput
 
     /*!
-      Whether the TextField should gain active focus on a mouse press. By default
-      this is set to true.
-      \qmlproperty bool activeFocusOnPress
-    */
-    property alias activeFocusOnPress: editor.activeFocusOnPress
-
-    /*!
       Whether the TextField should scroll when the text is longer than the width.
       By default this is set to true.
 
@@ -999,7 +992,7 @@
 
             // overrides
             selectByMouse: true
-            activeFocusOnPress: true
+            activeFocusOnPress: control.activeFocusOnPress
             onActiveFocusChanged: if (!activeFocus && inputHandler.popover) PopupUtils.close(inputHandler.popover)
 
             // input selection and navigation handling

=== modified file 'src/Ubuntu/Components/plugin/ucstyleditembase.cpp'
--- src/Ubuntu/Components/plugin/ucstyleditembase.cpp	2015-06-02 12:37:41 +0000
+++ src/Ubuntu/Components/plugin/ucstyleditembase.cpp	2015-07-29 11:41:48 +0000
@@ -203,6 +203,7 @@
         return;
     d->activeFocusOnPress = value;
     d->setFocusable(d->activeFocusOnPress);
+    setActiveFocusOnTab(value);
     Q_EMIT activeFocusOnPressChanged();
 }
 

=== modified file 'tests/unit_x11/tst_components/tst_focus.qml'
--- tests/unit_x11/tst_components/tst_focus.qml	2015-03-03 13:20:06 +0000
+++ tests/unit_x11/tst_components/tst_focus.qml	2015-07-29 11:41:48 +0000
@@ -17,10 +17,10 @@
 import QtQuick 2.2
 import QtTest 1.0
 import Ubuntu.Test 1.0
-import Ubuntu.Components 1.1
-import Ubuntu.Components.Pickers 1.0
-import Ubuntu.Components.ListItems 1.0 as ListItem
-import Ubuntu.Components.Popups 1.0
+import Ubuntu.Components 1.3
+import Ubuntu.Components.Pickers 1.3
+import Ubuntu.Components.ListItems 1.3 as ListItem
+import Ubuntu.Components.Popups 1.3
 
 Item {
     id: main
@@ -45,6 +45,9 @@
                 text: "Whatever"
             }
         }
+        Button {
+            id: dummy
+        }
         TextField {
             id: textField
             text: "This is a text field with some text handling focus"
@@ -178,6 +181,23 @@
             waitForRendering(data.focusOn, 200);
         }
 
+        function test_tab_focus_data() {
+            return [
+                {tag: "TextField", from: dummy, to: textField, key: Qt.Key_Tab},
+                {tag: "TextField(back)", from: textField, to: dummy, key: Qt.Key_Backtab},
+                {tag: "TextArea", from: textField, to: textArea, key: Qt.Key_Tab},
+                {tag: "TextArea(back)", from: textArea, to: textField, key: Qt.Key_Backtab},
+                {tag: "Button(back)", from: button, to: textArea, key: Qt.Key_Backtab},
+            ];
+        }
+        function test_tab_focus(data) {
+            data.from.forceActiveFocus();
+            verify(data.from.focus, "Source component is not focused");
+            keyClick(data.key);
+            waitForRendering(data.to, 200);
+            verify(data.to.focus, "Target component is not focused");
+        }
+
         function test_hide_osk_when_pickerpanel_opens() {
             if (!main.hasOSK) {
                 skip("This functionality can be tested with OSK only.");