1
=== modified file 'qml/Launcher/LauncherPanel.qml'
2
--- qml/Launcher/LauncherPanel.qml	2017-01-31 14:30:21 +0000
3
+++ qml/Launcher/LauncherPanel.qml	2017-02-24 15:32:15 +0000
4
@@ -572,16 +572,6 @@
5
572
                                // Move it down by the the missing size to compensate index calculation with only expanded items
572
                                // Move it down by the the missing size to compensate index calculation with only expanded items
6
573
                                itemCenterY += (launcherListView.itemHeight - selectedItem.height) / 2
573
                                itemCenterY += (launcherListView.itemHeight - selectedItem.height) / 2
7
574
574
8
575
                                if (mouseY > launcherListView.height - launcherListView.topMargin - launcherListView.bottomMargin - launcherListView.realItemHeight) {
9
576
                                    progressiveScrollingTimer.downwards = false
10
577
                                    progressiveScrollingTimer.start()
11
578
                                } else if (mouseY < launcherListView.realItemHeight) {
12
579
                                    progressiveScrollingTimer.downwards = true
13
580
                                    progressiveScrollingTimer.start()
14
581
                                } else {
15
582
                                    progressiveScrollingTimer.stop()
16
583
                                }
17
584
18
585
                                var newIndex = (itemCenterY + launcherListView.realContentY) / launcherListView.realItemHeight
575
                                var newIndex = (itemCenterY + launcherListView.realContentY) / launcherListView.realItemHeight
19
586
576
20
587
                                if (newIndex > draggedIndex + 1) {
577
                                if (newIndex > draggedIndex + 1) {
21
@@ -601,6 +591,19 @@
22
601
                                    }
591
                                    }
23
602
                                }
592
                                }
24
603
                            }
593
                            }
25
594
                            if (mouseY > launcherListView.height - launcherListView.topMargin - launcherListView.bottomMargin - launcherListView.realItemHeight
26
595
                                    // N.B: when using touch interaction, we sometimes get values like 2147483458 for mouseY
27
596
                                    // on touchRelease(). Working around that by making sure we're still inside the screen.
28
597
                                    && mouseY <= root.height
29
598
                                    ) {
30
599
                                progressiveScrollingTimer.downwards = false
31
600
                                progressiveScrollingTimer.start()
32
601
                            } else if (mouseY < launcherListView.realItemHeight) {
33
602
                                progressiveScrollingTimer.downwards = true
34
603
                                progressiveScrollingTimer.start()
35
604
                            } else {
36
605
                                progressiveScrollingTimer.stop()
37
606
                            }
38
604
                        }
607
                        }
39
605
                    }
608
                    }
40
606
                    Timer {
609
                    Timer {
41
@@ -613,12 +616,12 @@
42
613
                            if (downwards) {
616
                            if (downwards) {
43
614
                                var minY =  -launcherListView.topMargin
617
                                var minY =  -launcherListView.topMargin
44
615
                                if (launcherListView.contentY > minY) {
618
                                if (launcherListView.contentY > minY) {
46
616
                                    launcherListView.contentY = Math.max(launcherListView.contentY - units.dp(2), minY)
619
                                    launcherListView.contentY = Math.max(launcherListView.contentY - units.dp(dndArea.pressed ? 2 : 6), minY)
47
617
                                }
620
                                }
48
618
                            } else {
621
                            } else {
49
619
                                var maxY = launcherListView.contentHeight - launcherListView.height + launcherListView.topMargin + launcherListView.originY
622
                                var maxY = launcherListView.contentHeight - launcherListView.height + launcherListView.topMargin + launcherListView.originY
50
620
                                if (launcherListView.contentY < maxY) {
623
                                if (launcherListView.contentY < maxY) {
52
621
                                    launcherListView.contentY = Math.min(launcherListView.contentY + units.dp(2), maxY)
624
                                    launcherListView.contentY = Math.min(launcherListView.contentY + units.dp(dndArea.pressed ? 2 : 6), maxY)
53
622
                                }
625
                                }
54
623
                            }
626
                            }
55
624
                        }
627
                        }
56
625
628
57
=== modified file 'tests/qmltests/Launcher/tst_Launcher.qml'
58
--- tests/qmltests/Launcher/tst_Launcher.qml	2017-01-26 09:09:18 +0000
59
+++ tests/qmltests/Launcher/tst_Launcher.qml	2017-02-24 15:32:15 +0000
60
@@ -1500,5 +1500,17 @@
61
1500
            tryCompare(launcher, "maxPanelX", 0);
1500
            tryCompare(launcher, "maxPanelX", 0);
62
1501
            launcher.panelWidth = oldSize;
1501
            launcher.panelWidth = oldSize;
63
1502
        }
1502
        }
64
1503
65
1504
        function test_hoverAutoScrolling() {
66
1505
            revealByEdgePush();
67
1506
            var list = findChild(launcher, "launcherListView")
68
1507
            mouseMove(root, units.gu(4), root.height / 2)
69
1508
70
1509
            mouseMove(root, units.gu(4), root.height - units.gu(2))
71
1510
            tryCompare(list, "contentY", list.contentHeight - list.height + list.topMargin)
72
1511
73
1512
            mouseMove(root, units.gu(4), units.gu(12)) // BFB height
74
1513
            tryCompare(list, "contentY", -list.topMargin)
75
1514
        }
76
1503
    }
1515
    }
77
1504
}
1516
}
Reviewer	Review Type	Date Requested	Status
Lukáš Tinkl (community)		2017-02-22	Needs Fixing on 2017-03-16
Unity8 CI Bot	continuous-integration		Needs Fixing on 2017-02-24
Review via email: mp+317971@code.launchpad.net
1	=== modified file 'qml/Launcher/LauncherPanel.qml'
2	--- qml/Launcher/LauncherPanel.qml 2017-01-31 14:30:21 +0000
3	+++ qml/Launcher/LauncherPanel.qml 2017-02-24 15:32:15 +0000
4	@@ -572,16 +572,6 @@
5	572	// Move it down by the the missing size to compensate index calculation with only expanded items	572	// Move it down by the the missing size to compensate index calculation with only expanded items
6	573	itemCenterY += (launcherListView.itemHeight - selectedItem.height) / 2	573	itemCenterY += (launcherListView.itemHeight - selectedItem.height) / 2
7	574		574
8	575	if (mouseY > launcherListView.height - launcherListView.topMargin - launcherListView.bottomMargin - launcherListView.realItemHeight) {
9	576	progressiveScrollingTimer.downwards = false
10	577	progressiveScrollingTimer.start()
11	578	} else if (mouseY < launcherListView.realItemHeight) {
12	579	progressiveScrollingTimer.downwards = true
13	580	progressiveScrollingTimer.start()
14	581	} else {
15	582	progressiveScrollingTimer.stop()
16	583	}
17	584
18	585	var newIndex = (itemCenterY + launcherListView.realContentY) / launcherListView.realItemHeight	575	var newIndex = (itemCenterY + launcherListView.realContentY) / launcherListView.realItemHeight
19	586		576
20	587	if (newIndex > draggedIndex + 1) {	577	if (newIndex > draggedIndex + 1) {
21	@@ -601,6 +591,19 @@
22	601	}	591	}
23	602	}	592	}
24	603	}	593	}
25			594	if (mouseY > launcherListView.height - launcherListView.topMargin - launcherListView.bottomMargin - launcherListView.realItemHeight
26			595	// N.B: when using touch interaction, we sometimes get values like 2147483458 for mouseY
27			596	// on touchRelease(). Working around that by making sure we're still inside the screen.
28			597	&& mouseY <= root.height
29			598	) {
30			599	progressiveScrollingTimer.downwards = false
31			600	progressiveScrollingTimer.start()
32			601	} else if (mouseY < launcherListView.realItemHeight) {
33			602	progressiveScrollingTimer.downwards = true
34			603	progressiveScrollingTimer.start()
35			604	} else {
36			605	progressiveScrollingTimer.stop()
37			606	}
38	604	}	607	}
39	605	}	608	}
40	606	Timer {	609	Timer {
41	@@ -613,12 +616,12 @@
42	613	if (downwards) {	616	if (downwards) {
43	614	var minY = -launcherListView.topMargin	617	var minY = -launcherListView.topMargin
44	615	if (launcherListView.contentY > minY) {	618	if (launcherListView.contentY > minY) {
46	616	launcherListView.contentY = Math.max(launcherListView.contentY - units.dp(2), minY)	619	launcherListView.contentY = Math.max(launcherListView.contentY - units.dp(dndArea.pressed ? 2 : 6), minY)
47	617	}	620	}
48	618	} else {	621	} else {
49	619	var maxY = launcherListView.contentHeight - launcherListView.height + launcherListView.topMargin + launcherListView.originY	622	var maxY = launcherListView.contentHeight - launcherListView.height + launcherListView.topMargin + launcherListView.originY
50	620	if (launcherListView.contentY < maxY) {	623	if (launcherListView.contentY < maxY) {
52	621	launcherListView.contentY = Math.min(launcherListView.contentY + units.dp(2), maxY)	624	launcherListView.contentY = Math.min(launcherListView.contentY + units.dp(dndArea.pressed ? 2 : 6), maxY)
53	622	}	625	}
54	623	}	626	}
55	624	}	627	}
56	625		628
57	=== modified file 'tests/qmltests/Launcher/tst_Launcher.qml'
58	--- tests/qmltests/Launcher/tst_Launcher.qml 2017-01-26 09:09:18 +0000
59	+++ tests/qmltests/Launcher/tst_Launcher.qml 2017-02-24 15:32:15 +0000
60	@@ -1500,5 +1500,17 @@
61	1500	tryCompare(launcher, "maxPanelX", 0);	1500	tryCompare(launcher, "maxPanelX", 0);
62	1501	launcher.panelWidth = oldSize;	1501	launcher.panelWidth = oldSize;
63	1502	}	1502	}
64			1503
65			1504	function test_hoverAutoScrolling() {
66			1505	revealByEdgePush();
67			1506	var list = findChild(launcher, "launcherListView")
68			1507	mouseMove(root, units.gu(4), root.height / 2)
69			1508
70			1509	mouseMove(root, units.gu(4), root.height - units.gu(2))
71			1510	tryCompare(list, "contentY", list.contentHeight - list.height + list.topMargin)
72			1511
73			1512	mouseMove(root, units.gu(4), units.gu(12)) // BFB height
74			1513	tryCompare(list, "contentY", -list.topMargin)
75			1514	}
76	1503	}	1515	}
77	1504	}	1516	}