Merge lp:~zsombi/ubuntu-ui-toolkit/focusInComponents into lp:ubuntu-ui-toolkit/staging

[Zsombor Egri]

Move activeFocusOnTab from style into components.

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

FAILED: Continuous integration, rev:2104
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1425/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6432/console

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

review: Needs Fixing (continuous-integration)

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

PASSED: Continuous integration, rev:2104
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1432/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6439/console

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

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:2104
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/1182/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6442/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/1182/rebuild

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:2104
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1216/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6443/console

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

review: Approve (continuous-integration)

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

FAILED: Continuous integration, rev:2104
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/770/
Executed test runs:
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1425/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1432
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1216
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/1182
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6444/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6432
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6439
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6443
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6442

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

review: Needs Fixing (continuous-integration)

[Cris Dywan (kalikiana)]

Looking much less painful than I anticipated. Did try to test all the components thoroughly in case our unit tests weren't succifient, but it seems like there's no regressions (FTR there are bugs, such as Dialog not containing focus while it's open, or BottomEdge having a second ghost focus, or ListItem actions being inaccessible via keyboard, but they can be reproduced in staging)

review: Approve

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

PASSED: Continuous integration, rev:2104
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/1193/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6492/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/1193/rebuild

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:2104
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-yakkety/7/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6493/console

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

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:2104
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1443/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6494/console

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

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:2104
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1227/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6495/console

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

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:2104
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1436/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6497/console

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

review: Approve (continuous-integration)

=== modified file 'src/UbuntuToolkit/ucbottomedgehint.cpp'
--- src/UbuntuToolkit/ucbottomedgehint.cpp	2016-09-09 17:49:07 +0000
+++ src/UbuntuToolkit/ucbottomedgehint.cpp	2016-09-19 07:25:44 +0000
@@ -70,6 +70,9 @@
 
     // accept mouse events
     q->setAcceptedMouseButtons(Qt::LeftButton);
+
+    // set focusOnTab
+    q->setActiveFocusOnTab(true);
 }
 
 /*!

=== modified file 'src/imports/Components/1.3/Button.qml'
--- src/imports/Components/1.3/Button.qml	2016-05-25 12:48:10 +0000
+++ src/imports/Components/1.3/Button.qml	2016-09-19 07:25:44 +0000
@@ -122,4 +122,5 @@
     property string iconPosition: "left"
 
     styleName: "ButtonStyle"
+    activeFocusOnTab: true
 }

=== modified file 'src/imports/Components/1.3/CheckBox.qml'
--- src/imports/Components/1.3/CheckBox.qml	2016-05-25 12:48:10 +0000
+++ src/imports/Components/1.3/CheckBox.qml	2016-09-19 07:25:44 +0000
@@ -50,4 +50,5 @@
     onTriggered: checked = !checked
 
     styleName: "CheckBoxStyle"
+    activeFocusOnTab: true
 }

=== modified file 'src/imports/Components/1.3/ComboButton.qml'
--- src/imports/Components/1.3/ComboButton.qml	2016-09-13 15:01:14 +0000
+++ src/imports/Components/1.3/ComboButton.qml	2016-09-19 07:25:44 +0000
@@ -298,6 +298,7 @@
     default property alias comboList: comboListHolder.data
 
     styleName: "ComboButtonStyle"
+    activeFocusOnTab: true
 
     // update sensing area to report clicks only on the main button area
     // area excluding dropDown button and combo list

=== modified file 'src/imports/Components/1.3/Slider.qml'
--- src/imports/Components/1.3/Slider.qml	2016-05-25 12:48:10 +0000
+++ src/imports/Components/1.3/Slider.qml	2016-09-19 07:25:44 +0000
@@ -112,6 +112,7 @@
     onValueChanged: mouseArea.liveValue = slider.value
 
     activeFocusOnPress: true
+    activeFocusOnTab: true
 
     Binding {
         target: slider

=== modified file 'src/imports/Components/1.3/TextArea.qml'
--- src/imports/Components/1.3/TextArea.qml	2016-06-21 11:20:14 +0000
+++ src/imports/Components/1.3/TextArea.qml	2016-09-19 07:25:44 +0000
@@ -95,6 +95,7 @@
     id: control
     implicitWidth: units.gu(30)
     implicitHeight: (autoSize) ? internal.minimumSize : internal.linesHeight(4)
+    activeFocusOnTab: true
 
     // new properties
     /*!

=== modified file 'src/imports/Components/1.3/TextField.qml'
--- src/imports/Components/1.3/TextField.qml	2016-06-21 11:20:14 +0000
+++ src/imports/Components/1.3/TextField.qml	2016-09-19 07:25:44 +0000
@@ -104,6 +104,7 @@
 
     implicitWidth: units.gu(25)
     implicitHeight: units.gu(4)
+    activeFocusOnTab: true
     /*!
       The property presents whether the TextField is highlighted or not. By
       default the TextField gets highlighted when gets the focus, so can accept

=== modified file 'src/imports/Components/Themes/Ambiance/1.3/ActionBarStyle.qml'
--- src/imports/Components/Themes/Ambiance/1.3/ActionBarStyle.qml	2016-07-14 12:49:23 +0000
+++ src/imports/Components/Themes/Ambiance/1.3/ActionBarStyle.qml	2016-09-19 07:25:44 +0000
@@ -60,6 +60,7 @@
             objectName: action.objectName + "_button"
             height: parent ? parent.height : undefined
             action: modelData
+            activeFocusOnTab: true
         }
     }
 

=== modified file 'src/imports/Components/Themes/Ambiance/1.3/FocusShape.qml'
--- src/imports/Components/Themes/Ambiance/1.3/FocusShape.qml	2016-07-14 07:41:06 +0000
+++ src/imports/Components/Themes/Ambiance/1.3/FocusShape.qml	2016-09-19 07:25:44 +0000
@@ -35,11 +35,4 @@
             duration: UbuntuAnimation.FastDuration
         }
     }
-
-    Binding {
-        target: styledItem
-        property: "activeFocusOnTab"
-        value: true
-        when: styledItem
-    }
 }

=== modified file 'src/imports/Components/Themes/Ambiance/1.3/PageHeadStyle.qml'
--- src/imports/Components/Themes/Ambiance/1.3/PageHeadStyle.qml	2016-06-09 10:29:56 +0000
+++ src/imports/Components/Themes/Ambiance/1.3/PageHeadStyle.qml	2016-09-19 07:25:44 +0000
@@ -437,6 +437,7 @@
                 objectName: action.objectName + "_button"
                 height: parent ? parent.height : undefined
                 action: modelData
+                activeFocusOnTab: true
                 StyleHints {
                     foregroundColor: headerStyle.buttonColor
                 }

=== modified file 'src/imports/Components/Themes/Ambiance/1.3/PageHeaderStyle.qml'
--- src/imports/Components/Themes/Ambiance/1.3/PageHeaderStyle.qml	2016-07-14 13:48:01 +0000
+++ src/imports/Components/Themes/Ambiance/1.3/PageHeaderStyle.qml	2016-09-19 07:25:44 +0000
@@ -97,6 +97,7 @@
         objectName: action.objectName + "_button"
         height: internal.titleAreaHeight
         action: modelData
+        activeFocusOnTab: true
         StyleHints {
             foregroundColor: button.pressed ?
                                  pageHeaderStyle.buttons.pressedForegroundColor :

=== modified file 'src/imports/Components/Themes/Ambiance/1.3/ToolbarStyle.qml'
--- src/imports/Components/Themes/Ambiance/1.3/ToolbarStyle.qml	2015-12-16 10:48:15 +0000
+++ src/imports/Components/Themes/Ambiance/1.3/ToolbarStyle.qml	2016-09-19 07:25:44 +0000
@@ -34,5 +34,6 @@
         height: parent ? parent.height : undefined
         width: units.gu(4)
         action: modelData
+        activeFocusOnTab: true
     }
 }

=== modified file 'tests/unit/visual/tst_actionbar.13.qml'
--- tests/unit/visual/tst_actionbar.13.qml	2016-09-07 14:27:12 +0000
+++ tests/unit/visual/tst_actionbar.13.qml	2016-09-19 07:25:44 +0000
@@ -226,6 +226,7 @@
                 styleName: "IconButtonStyle"
                 action: modelData
                 height: greenButtonsBar.height
+                activeFocusOnTab: true
                 StyleHints {
                     foregroundColor: UbuntuColors.green
                 }

=== added file 'tests/unit/visual/tst_listitem_horizontal_navigation.13.qml'
--- tests/unit/visual/tst_listitem_horizontal_navigation.13.qml	1970-01-01 00:00:00 +0000
+++ tests/unit/visual/tst_listitem_horizontal_navigation.13.qml	2016-09-19 07:25:44 +0000
@@ -0,0 +1,66 @@
+/*
+ * Copyright 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
+ * 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.4
+import QtTest 1.0
+import Ubuntu.Test 1.3
+import Ubuntu.Components 1.3
+import QtQuick.Window 2.1
+
+Item {
+    width: units.gu(40)
+    height: units.gu(70)
+
+    ListView {
+        id: testView
+         anchors.fill: parent
+         model: 10
+         orientation: ListView.Horizontal
+         delegate: ListItem {
+             width: units.gu(5)
+             height: units.gu(5)
+             objectName: "listitem" + index
+             Button {
+                 activeFocusOnTab: false
+                 anchors {
+                     fill: parent
+                     margins: units.gu(1)
+                 }
+                 text: "Button #" + index
+             }
+         }
+     }
+
+    UbuntuTestCase {
+        when: windowShown
+
+        function test_navigation_bug1590005_data() {
+            return [
+                {tag: "beyond first", index: 0, key: Qt.Key_Left, focusItem: "listitem0"},
+                {tag: "beyond last", index: 9, key: Qt.Key_Right, focusItem: "listitem9"},
+            ]
+        }
+        function test_navigation_bug1590005(data) {
+            testView.forceActiveFocus();
+            testView.currentIndex = data.index;
+            waitForRendering(testView, 500);
+
+            keyClick(data.key);
+            waitForRendering(testView, 500);
+            compare(testView.Window.activeFocusItem, findChild(testView, data.focusItem));
+        }
+    }
+}