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

[Zsombor Egri]

Do not show focus frame on ListItem when clicked.

Do not show focus frame on ListItem when clicked.

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

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

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

review: Approve (continuous-integration)

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

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

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

review: Approve (continuous-integration)

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

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

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

review: Approve (continuous-integration)

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

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

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

review: Approve (continuous-integration)

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

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

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

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:2139
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/825/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1536
        deb: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1536/artifact/artifacts/*zip*/artifacts.zip
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1543
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1327
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/1293
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-yakkety/107
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/7064/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/7063
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/7061
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/7060
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/7059
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/7062

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

review: Approve (continuous-integration)

[Cris Dywan (kalikiana)]

> 8 + , isEventFilter(false)
> 9 + , keyNavigation(false)

I'm dreaming of GCC properly failing builds with warnings, which are triggered consistently - or perhaps we need to switch to building with clang eventually.

Nice catch in any case.

review: Approve

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

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

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

review: Approve (continuous-integration)

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

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

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

review: Approve (continuous-integration)

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

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

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

review: Approve (continuous-integration)

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

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

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

review: Approve (continuous-integration)

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

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

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

review: Approve (continuous-integration)

=== modified file 'src/UbuntuToolkit/privates/listviewextensions.cpp'
--- src/UbuntuToolkit/privates/listviewextensions.cpp	2016-09-16 05:01:13 +0000
+++ src/UbuntuToolkit/privates/listviewextensions.cpp	2016-10-11 12:18:36 +0000
@@ -31,6 +31,8 @@
     : QObject(parent)
     , listView(listView)
     , _currentItem(Q_NULLPTR)
+    , isEventFilter(false)
+    , keyNavigation(false)
 {
     connect(listView, SIGNAL(currentItemChanged()), this, SLOT(onCurrentItemChanged()), Qt::DirectConnection);
     onCurrentItemChanged();

=== modified file 'tests/unit/visual/tst_listitem_focus_bug.13.qml'
--- tests/unit/visual/tst_listitem_focus_bug.13.qml	2016-09-08 10:21:35 +0000
+++ tests/unit/visual/tst_listitem_focus_bug.13.qml	2016-10-11 12:18:36 +0000
@@ -29,22 +29,37 @@
         id: testView
         anchors.fill: parent
         model: 50
-        currentIndex: 10
+        currentIndex: -1
         delegate: ListItem { width: testView.width; height: units.gu(7)
             objectName: "listItem" + index
-            enabled: index > 20 && index < 25
+            enabled: index == 4 || (index > 20 && index < 25)
             Label {
                 anchors.centerIn: parent
                 text: (parent.enabled ? "enabled" : "disabled") + index
             }
+            onClicked: testView.currentIndex = index
         }
     }
 
+    SignalSpy {
+        id: currentItemSpy
+        target: testView
+        signalName: "currentItemChanged"
+    }
+
     UbuntuTestCase {
         when: windowShown
 
         function cleanup() {
             main.forceActiveFocus();
+            currentItemSpy.clear();
+        }
+
+        function test_0_first_time_focus_on_listview_bug1628855() {
+            var listItem = findChild(testView, "listItem4");
+            mouseClick(listItem, centerOf(listItem).x, centerOf(listItem).y);
+            currentItemSpy.wait();
+            compare(listItem.keyNavigationFocus, false);
         }
 
         function test_focus_bug1611327_data() {