1
=== modified file 'src/UbuntuToolkit/privates/listviewextensions.cpp'
2
--- src/UbuntuToolkit/privates/listviewextensions.cpp	2016-09-16 05:01:13 +0000
3
+++ src/UbuntuToolkit/privates/listviewextensions.cpp	2016-10-11 12:18:36 +0000
4
@@ -31,6 +31,8 @@
5
31
    : QObject(parent)
31
    : QObject(parent)
6
32
    , listView(listView)
32
    , listView(listView)
7
33
    , _currentItem(Q_NULLPTR)
33
    , _currentItem(Q_NULLPTR)
8
34
    , isEventFilter(false)
9
35
    , keyNavigation(false)
10
34
{
36
{
11
35
    connect(listView, SIGNAL(currentItemChanged()), this, SLOT(onCurrentItemChanged()), Qt::DirectConnection);
37
    connect(listView, SIGNAL(currentItemChanged()), this, SLOT(onCurrentItemChanged()), Qt::DirectConnection);
12
36
    onCurrentItemChanged();
38
    onCurrentItemChanged();
13
37
39
14
=== modified file 'tests/unit/visual/tst_listitem_focus_bug.13.qml'
15
--- tests/unit/visual/tst_listitem_focus_bug.13.qml	2016-09-08 10:21:35 +0000
16
+++ tests/unit/visual/tst_listitem_focus_bug.13.qml	2016-10-11 12:18:36 +0000
17
@@ -29,22 +29,37 @@
18
29
        id: testView
29
        id: testView
19
30
        anchors.fill: parent
30
        anchors.fill: parent
20
31
        model: 50
31
        model: 50
22
32
        currentIndex: 10
32
        currentIndex: -1
23
33
        delegate: ListItem { width: testView.width; height: units.gu(7)
33
        delegate: ListItem { width: testView.width; height: units.gu(7)
24
34
            objectName: "listItem" + index
34
            objectName: "listItem" + index
26
35
            enabled: index > 20 && index < 25
35
            enabled: index == 4 || (index > 20 && index < 25)
27
36
            Label {
36
            Label {
28
37
                anchors.centerIn: parent
37
                anchors.centerIn: parent
29
38
                text: (parent.enabled ? "enabled" : "disabled") + index
38
                text: (parent.enabled ? "enabled" : "disabled") + index
30
39
            }
39
            }
31
40
            onClicked: testView.currentIndex = index
32
40
        }
41
        }
33
41
    }
42
    }
34
42
43
35
44
    SignalSpy {
36
45
        id: currentItemSpy
37
46
        target: testView
38
47
        signalName: "currentItemChanged"
39
48
    }
40
49
41
43
    UbuntuTestCase {
50
    UbuntuTestCase {
42
44
        when: windowShown
51
        when: windowShown
43
45
52
44
46
        function cleanup() {
53
        function cleanup() {
45
47
            main.forceActiveFocus();
54
            main.forceActiveFocus();
46
55
            currentItemSpy.clear();
47
56
        }
48
57
49
58
        function test_0_first_time_focus_on_listview_bug1628855() {
50
59
            var listItem = findChild(testView, "listItem4");
51
60
            mouseClick(listItem, centerOf(listItem).x, centerOf(listItem).y);
52
61
            currentItemSpy.wait();
53
62
            compare(listItem.keyNavigationFocus, false);
54
48
        }
63
        }
55
49
64
56
50
        function test_focus_bug1611327_data() {
65
        function test_focus_bug1611327_data() {
Reviewer	Review Type	Date Requested	Status
ubuntu-sdk-build-bot	continuous-integration		Approve on 2016-10-12
Cris Dywan		2016-10-06	Approve on 2016-10-12
Review via email: mp+307822@code.launchpad.net