on xenial help sign in
rejigged order
commit36732a02e819412754647fc6de20f871f4bf499d authorNick Dedekind <nick.dedekind@canonical.com> dateThu 9 Oct 2014, 12:24 (12 years ago) parentf653b91
1 file changed+8−7
qml/Components/ScrollCalculator.qml+8−7
qml/Components/ScrollCalculator.qml+8−7
@@ -30,15 +30,21 @@ Item {
3030
3131 signal scroll(real scrollAmount)
3232
33− onAreaActiveChanged: areaActive ? handleEnter() : handleExit()
34−
3533 width: units.gu(5)
3634 rotation: direction === Qt.LeftToRight ? 0 : 180
3735
36+ onAreaActiveChanged: areaActive ? handleEnter() : handleExit()
37+
3838 function handleEnter() {
3939 d.threasholdAreaX = -scrollArea.stopScrollThreshold;
4040 scrollTimer.restart();
4141 }
42+
43+ function handleExit() {
44+ d.threasholdAreaX = -scrollArea.stopScrollThreshold;
45+ scrollTimer.stop();
46+ }
47+
4248 onLateralPositionChanged: {
4349 if (scrollArea.areaActive) {
4450 if (lateralPosition > width * (1 - forceScrollingPercentage)) {
@@ -56,11 +62,6 @@ Item {
5662 }
5763 }
5864
59− function handleExit() {
60− d.threasholdAreaX = -scrollArea.stopScrollThreshold;
61− scrollTimer.stop();
62− }
63−
6465 Timer {
6566 id: scrollTimer
6667 interval: 16