Merge lp:~michael-sheldon/ubuntu-ui-toolkit/fix-1518352 into lp:ubuntu-ui-toolkit/staging

[Michael Sheldon]

Set the activeFocus on the input component when a text input area receives focus

Set the activeFocus on the input component when a text input area receives focus

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1723
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2519/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/1247
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1249
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1249/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/1246

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

review: Approve (continuous-integration)

[Cris Dywan (kalikiana)]

This needs unit tests.

review: Needs Fixing

[Cris Dywan (kalikiana)]

That's looking very nice! Thanks! Let's hope J is fine with it then I have no reason to stop it now.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1725
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2636/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/1364
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1367
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1367/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/1363

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

review: Approve (continuous-integration)

=== modified file 'src/Ubuntu/Components/1.2/InputHandler.qml'
--- src/Ubuntu/Components/1.2/InputHandler.qml	2015-06-29 17:48:58 +0000
+++ src/Ubuntu/Components/1.2/InputHandler.qml	2015-12-15 14:49:28 +0000
@@ -285,13 +285,17 @@
         }
     ]
 
-    // brings the state back to default when the component looses focuse
+    // brings the state back to default when the component looses focus
+    // and ensures input has active focus when component regains focus
     Connections {
         target: main
         ignoreUnknownSignals: true
         onFocusChanged: {
             UbuntuApplication.inputMethod.commit()
             state = (main.focus) ? "" : "inactive";
+            if (main.focus) {
+                input.forceActiveFocus()
+            }
         }
     }
 

=== modified file 'src/Ubuntu/Components/1.3/InputHandler.qml'
--- src/Ubuntu/Components/1.3/InputHandler.qml	2015-08-11 17:15:59 +0000
+++ src/Ubuntu/Components/1.3/InputHandler.qml	2015-12-15 14:49:28 +0000
@@ -285,13 +285,17 @@
         }
     ]
 
-    // brings the state back to default when the component looses focuse
+    // brings the state back to default when the component looses focus
+    // and ensures input has active focus when component regains focus
     Connections {
         target: main
         ignoreUnknownSignals: true
         onFocusChanged: {
             UbuntuApplication.inputMethod.commit()
             state = (main.focus) ? "" : "inactive";
+            if (main.focus) {
+                input.forceActiveFocus()
+            }
         }
     }
 

=== added file 'tests/unit/tst_components/tst_inputhandler_v12.qml'
--- tests/unit/tst_components/tst_inputhandler_v12.qml	1970-01-01 00:00:00 +0000
+++ tests/unit/tst_components/tst_inputhandler_v12.qml	2015-12-15 14:49:28 +0000
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2013 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
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import QtTest 1.0
+import Ubuntu.Test 1.0
+import Ubuntu.Components 1.2
+
+UbuntuTestCase {
+    name: "InputHandlerTest"
+
+    TextField {
+        id: tf
+    }
+
+    function test_internalFocus() {
+        var handler = findChild(tf, "input_handler");
+        tf.focus = false
+        handler.input.focus = false
+        compare(tf.focus, false, "Text field doesn't have focus");
+        compare(handler.input.focus, false, "Input doesn't have focus");
+        tf.focus = true
+        compare(tf.focus, true, "Focus restored to text field");
+        compare(handler.input.focus, true, "Focus automatically restored to input handler");
+    }
+}

=== added file 'tests/unit/tst_components/tst_inputhandler_v13.qml'
--- tests/unit/tst_components/tst_inputhandler_v13.qml	1970-01-01 00:00:00 +0000
+++ tests/unit/tst_components/tst_inputhandler_v13.qml	2015-12-15 14:49:28 +0000
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2013 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
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import QtTest 1.0
+import Ubuntu.Test 1.0
+import Ubuntu.Components 1.3
+
+UbuntuTestCase {
+    name: "InputHandlerTest"
+
+    TextField {
+        id: tf
+    }
+
+    function test_internalFocus() {
+        var handler = findChild(tf, "input_handler");
+        tf.focus = false
+        handler.input.focus = false
+        compare(tf.focus, false, "Text field doesn't have focus");
+        compare(handler.input.focus, false, "Input doesn't have focus");
+        tf.focus = true
+        compare(tf.focus, true, "Focus restored to text field");
+        compare(handler.input.focus, true, "Focus automatically restored to input handler");
+    }
+}