1
=== modified file 'src/Ubuntu/Components/plugin/uclistitem.cpp'
2
--- src/Ubuntu/Components/plugin/uclistitem.cpp	2016-02-01 18:57:26 +0000
3
+++ src/Ubuntu/Components/plugin/uclistitem.cpp	2016-02-08 11:01:16 +0000
4
@@ -1250,6 +1250,8 @@
5
1250
    }
1250
    }
6
1251
1251
7
1252
    UCStyledItemBase::mouseReleaseEvent(event);
1252
    UCStyledItemBase::mouseReleaseEvent(event);
8
1253
    if (!contains(mapFromScene(event->windowPos())))
9
1254
        d->suppressClick = true;
10
1253
    d->handleLeftButtonRelease(event);
1255
    d->handleLeftButtonRelease(event);
11
1254
}
1256
}
12
1255
1257
13
1256
1258
14
=== modified file 'tests/unit_x11/tst_components/tst_listitem13.qml'
15
--- tests/unit_x11/tst_components/tst_listitem13.qml	2015-12-08 10:34:22 +0000
16
+++ tests/unit_x11/tst_components/tst_listitem13.qml	2016-02-08 11:01:16 +0000
17
@@ -350,6 +350,21 @@
18
350
            movingSpy.wait();
350
            movingSpy.wait();
19
351
        }
351
        }
20
352
352
21
353
        function test_release_outside() {
22
354
            var listItem = defaults;
23
355
            clickSpy.target = listItem;
24
356
            clickSpy.clear();
25
357
            highlightedSpy.target = listItem;
26
358
            highlightedSpy.clear();
27
359
28
360
            mousePress(listItem, listItem.width / 2, listItem.height / 2);
29
361
            highlightedSpy.wait();
30
362
            mouseMove(listView, 0, 0, 100);
31
363
            mouseRelease(listView, 0, 0);
32
364
            highlightedSpy.wait();
33
365
            compare(clickSpy.count, 0, "Click must be suppressed when releasing outside of item");
34
366
        }
35
367
36
353
        function test_vertical_listview_move_cancels_highlight_data() {
368
        function test_vertical_listview_move_cancels_highlight_data() {
37
354
            return [
369
            return [
38
355
                {tag: "With touch", mouse: false},
370
                {tag: "With touch", mouse: false},
39
@@ -360,11 +375,17 @@
40
360
            var listItem = findChild(listView, "listItem0");
375
            var listItem = findChild(listView, "listItem0");
41
361
            verify(listItem, "Cannot find listItem0");
376
            verify(listItem, "Cannot find listItem0");
42
362
377
43
378
            clickSpy.target = listItem;
44
379
            clickSpy.clear();
45
380
            highlightedSpy.target = listItem;
46
381
            highlightedSpy.clear();
47
382
48
363
            // convert positions and use the listView to move
383
            // convert positions and use the listView to move
49
364
            var pos = listView.mapFromItem(listItem, listItem.width / 2, 0);
384
            var pos = listView.mapFromItem(listItem, listItem.width / 2, 0);
50
365
            if (data.mouse) {
385
            if (data.mouse) {
51
366
                // provide slow move
386
                // provide slow move
52
367
                mousePress(listView, pos.x, pos.y);
387
                mousePress(listView, pos.x, pos.y);
53
388
                highlightedSpy.wait();
54
368
                for (var i = 1; i < 4; i++) {
389
                for (var i = 1; i < 4; i++) {
55
369
                    pos.y += i * units.gu(0.5);
390
                    pos.y += i * units.gu(0.5);
56
370
                    mouseMove(listView, pos.x, pos.y, 100);
391
                    mouseMove(listView, pos.x, pos.y, 100);
57
@@ -375,6 +396,7 @@
58
375
                // convert pos to point otherwise touch functions will get (0,0) points!!!
396
                // convert pos to point otherwise touch functions will get (0,0) points!!!
59
376
                var pt = Qt.point(pos.x, pos.y);
397
                var pt = Qt.point(pos.x, pos.y);
60
377
                TestExtras.touchPress(0, listView, pt);
398
                TestExtras.touchPress(0, listView, pt);
61
399
                highlightedSpy.wait();
62
378
                for (i = 1; i < 4; i++) {
400
                for (i = 1; i < 4; i++) {
63
379
                    pt.y += i * units.gu(0.5);
401
                    pt.y += i * units.gu(0.5);
64
380
                    TestExtras.touchMove(0, listView, pt);
402
                    TestExtras.touchMove(0, listView, pt);
65
@@ -383,6 +405,7 @@
66
383
                compare(listItem.highlighted, false, "highlighted still!");
405
                compare(listItem.highlighted, false, "highlighted still!");
67
384
                TestExtras.touchRelease(0, listView, pt);
406
                TestExtras.touchRelease(0, listView, pt);
68
385
            }
407
            }
69
408
            compare(clickSpy.count, 0, "Click must be suppressed when releasing outside of item");
70
386
        }
409
        }
71
387
410
72
388
        function test_background_height_change_on_divider_visible() {
411
        function test_background_height_change_on_divider_visible() {
Reviewer	Review Type	Date Requested	Status
ubuntu-sdk-build-bot	continuous-integration		Approve on 2016-02-08
Zsombor Egri		2016-02-04	Approve on 2016-02-08
Review via email: mp+285094@code.launchpad.net