Merge lp:~osomon/ubuntu-ui-toolkit/child-activeFocusOnPress into lp:ubuntu-ui-toolkit/staging

[Olivier Tilloy]

Do not try to assign to non-existent property "activeFocusOnPress".

[Cris Dywan (kalikiana)]

Good find.

Please add a unit test for it, probably in tests/unit_x11/tst_components/tst_focus.qml and it's good to go.

review: Needs Fixing

[Cris Dywan (kalikiana)]

Very nice. Thanks a lot!

review: Approve

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:1821
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-singlenode/166/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/368/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-singlenode/166/rebuild

review: Needs Fixing (continuous-integration)

[Cris Dywan (kalikiana)]

False negative above:
error: device not found

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:1821
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64/163/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/375/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64/163/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Autolanding.
More details in the following jenkins job:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-autolanding/97/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-land-mp/97/console

review: Needs Fixing (continuous-integration)

[Cris Dywan (kalikiana)]

Same false positive:
error: device not found

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:1821
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-singlenode/170/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/380/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-singlenode/170/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:1821
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64/166/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/381/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64/166/rebuild

review: Approve (continuous-integration)

=== modified file 'src/Ubuntu/Components/1.3/TextField.qml'
--- src/Ubuntu/Components/1.3/TextField.qml	2016-01-13 14:25:22 +0000
+++ src/Ubuntu/Components/1.3/TextField.qml	2016-01-26 09:57:19 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Canonical Ltd.
+ * Copyright 2015-2016 Canonical Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -896,10 +896,13 @@
         onChildrenChanged: {
             // reparenting
             for (var i = 0; i < children.length; i++) {
-                children[i].parent = leftPane;
-                children[i].anchors.verticalCenter = verticalCenter;
-                children[i].activeFocusOnPress = false;
-                children[i].activeFocusOnTab = false;
+                var child = children[i];
+                child.parent = leftPane;
+                child.anchors.verticalCenter = verticalCenter;
+                if (child.hasOwnProperty("activeFocusOnPress")) {
+                    child.activeFocusOnPress = false;
+                }
+                child.activeFocusOnTab = false;
             }
         }
     }
@@ -920,10 +923,13 @@
         onChildrenChanged: {
             // reparenting
             for (var i = 0; i < children.length; i++) {
-                children[i].parent = rightPane;
-                children[i].anchors.verticalCenter = verticalCenter;
-                children[i].activeFocusOnPress = false;
-                children[i].activeFocusOnTab = false;
+                var child = children[i];
+                child.parent = rightPane;
+                child.anchors.verticalCenter = verticalCenter;
+                if (child.hasOwnProperty("activeFocusOnPress")) {
+                    child.activeFocusOnPress = false;
+                }
+                child.activeFocusOnTab = false;
             }
         }
     }

=== modified file 'tests/unit_x11/tst_components/tst_focus.qml'
--- tests/unit_x11/tst_components/tst_focus.qml	2015-12-16 07:42:17 +0000
+++ tests/unit_x11/tst_components/tst_focus.qml	2016-01-26 09:57:19 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 Canonical Ltd.
+ * Copyright 2014-2016 Canonical Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -51,6 +51,16 @@
         TextField {
             id: textField
             text: "This is a text field with some text handling focus"
+            primaryItem: MouseArea {
+                id: textFieldPrimaryItem
+                height: parent.height
+                width: height
+            }
+            secondaryItem: TextField {
+                id: textFieldSecondaryItem
+                height: parent.height
+                width: height
+            }
         }
         TextArea {
             id: textArea
@@ -164,6 +174,12 @@
             signalName: "onDestruction"
         }
 
+        SignalSpy {
+            id: textFieldPrimaryItemClickedSpy
+            target: textFieldPrimaryItem
+            signalName: "onClicked"
+        }
+
         function initTestCase() {
             main.hasOSK = QuickUtils.inputMethodProvider !== ""
             textField.forceActiveFocus();
@@ -244,6 +260,24 @@
             textField.text = text;
         }
 
+        function test_textfield_primary_and_secondary_items_keeps_focus() {
+            textFieldPrimaryItemClickedSpy.clear();
+            textField.forceActiveFocus();
+            verify(textField.activeFocus);
+            verify(!textFieldSecondaryItem.activeFocusOnPress);
+
+            var center = centerOf(textFieldPrimaryItem);
+            mouseClick(textFieldPrimaryItem, center.x, center.y);
+            compare(textFieldPrimaryItemClickedSpy.count, 1);
+            verify(textField.activeFocus);
+            verify(!textFieldPrimaryItem.activeFocus);
+
+            center = centerOf(textFieldSecondaryItem);
+            mouseClick(textFieldSecondaryItem, center.x, center.y);
+            verify(textField.activeFocus);
+            verify(!textFieldSecondaryItem.activeFocus);
+        }
+
         function test_combo_button_dropdown_focuses_component() {
             textField.forceActiveFocus();
             var dropdownButton = findChild(comboButton, "combobutton_dropdown");