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

[Cris Dywan]

Enforce !activeFocusOnPress on TextField primary/secondaryItem

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1717
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2494/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/1222
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1224
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1224/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/1221

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

review: Approve (continuous-integration)

[Albert Astals Cid (aacid)]

This does not fix the problem in my bug report.

review: Needs Fixing

[Zsombor Egri (zsombi)]

Good, one prerequisite to make sure overlay elements don't get focus.

review: Approve

=== modified file 'src/Ubuntu/Components/1.3/TextField.qml'
--- src/Ubuntu/Components/1.3/TextField.qml	2015-09-28 14:36:54 +0000
+++ src/Ubuntu/Components/1.3/TextField.qml	2015-11-17 15:20:32 +0000
@@ -870,6 +870,7 @@
             for (var i = 0; i < children.length; i++) {
                 children[i].parent = leftPane;
                 children[i].anchors.verticalCenter = verticalCenter;
+                children[i].activeFocusOnPress = false;
             }
         }
     }
@@ -892,6 +893,7 @@
             for (var i = 0; i < children.length; i++) {
                 children[i].parent = rightPane;
                 children[i].anchors.verticalCenter = verticalCenter;
+                children[i].activeFocusOnPress = false;
             }
         }
     }

=== modified file 'tests/unit_x11/tst_components/tst_textinput_common13.qml'
--- tests/unit_x11/tst_components/tst_textinput_common13.qml	2015-07-02 23:17:41 +0000
+++ tests/unit_x11/tst_components/tst_textinput_common13.qml	2015-11-17 15:20:32 +0000
@@ -96,6 +96,31 @@
         TextField {
             id: textField
         }
+
+        TextField {
+            id: customTextField
+            text: 'Lorem ipsum dolor sit amet'
+            primaryItem: AbstractButton {
+                id: primaryButton
+                height: parent.height
+                width: height
+                Image {
+                    anchors.fill: parent
+                    anchors.margins: units.gu(0.5)
+                    source: 'image://theme/torch-on'
+                }
+            }
+            secondaryItem: AbstractButton {
+                id: secondaryButton
+                height: parent.height
+                width: height
+                Image {
+                    anchors.fill: parent
+                    anchors.margins: units.gu(0.5)
+                    source: 'image://theme/settings'
+                }
+            }
+        }
         TextArea {
             id: textArea
         }
@@ -443,5 +468,19 @@
             else
                 verify(popoverY >= 0, 'Popover went off-screen: %1'.arg(popoverY));
         }
+
+        function test_secondaryItem_must_not_grab_focus() {
+            var textField = customTextField;
+            textField.forceActiveFocus();
+            compare(textField.focus, true, 'TextField is focused');
+
+            var clearButton = findChild(textField, "clear_button")
+            mouseClick(clearButton, clearButton.width/2, clearButton.height/2);
+            compare(textField.focus, true, 'TextField remains focused');
+            mouseClick(primaryButton, primaryButton.width/2, primaryButton.height/2);
+            compare(textField.focus, true, 'TextField remains focused');
+            mouseClick(secondaryButton, secondaryButton.width/2, secondaryButton.height/2);
+            compare(textField.focus, true, 'TextField remains focused');
+        }
     }
 }