git.iko.soy/unity8
on xenial help sign in
remove timer
0e8ba21Andrea Cimitan
qml/Dash/GenericScopeView.qml+1−3
compare with xenial
unifiedsplit
@@ -732,9 +732,7 @@ FocusScope {
732
732
733 style: PullToRefreshScopeStyle {
733 style: PullToRefreshScopeStyle {
734 anchors.fill: parent
734 anchors.fill: parent
735− activationThreshold: units.gu(14)
735+ activationThreshold: Math.min(units.gu(14), scopeView.height / 5)
736− timerEnabled: activationThreshold > scopeView.height / 3
737− minimumPullThreshold: units.gu(5)
738 }
736 }
739 }
737 }
740 }
738 }
qml/Dash/PullToRefreshScopeStyle.qml+1−27
@@ -25,24 +25,8 @@ import Ubuntu.Components.Styles 1.3
25 */
25 */
26PullToRefreshStyle {
26PullToRefreshStyle {
27 id: pullToRefreshScopeStyle
27 id: pullToRefreshScopeStyle
28− property bool timerEnabled: false
29− property bool timerTriggered: false
30− property int minimumPullThreshold
31
28
32− releaseToRefresh: timerTriggered || styledItem.target.originY - styledItem.target.contentY > activationThreshold
29+ releaseToRefresh: styledItem.target.originY - styledItem.target.contentY > activationThreshold
33−
34− onTimerEnabledChanged: if (!timerEnabled) stopTimer()
35−
36− Timer {
37− id: timer
38− interval: 150
39− onTriggered: pullToRefreshScopeStyle.timerTriggered = true
40− }
41−
42− function stopTimer() {
43− timer.stop()
44− timerTriggered = false
45− }
46
30
47 Connections {
31 Connections {
48 property bool willRefresh: false
32 property bool willRefresh: false
@@ -52,21 +36,11 @@ PullToRefreshStyle {
52 if (!styledItem.target.dragging && releaseToRefresh) {
36 if (!styledItem.target.dragging && releaseToRefresh) {
53 willRefresh = true
37 willRefresh = true
54 }
38 }
55−
56− if (timerEnabled && !styledItem.target.dragging) {
57− pullToRefreshScopeStyle.stopTimer()
58− }
59 }
39 }
60 onContentYChanged: {
40 onContentYChanged: {
61 if (styledItem.target.originY - styledItem.target.contentY == 0 && willRefresh) {
41 if (styledItem.target.originY - styledItem.target.contentY == 0 && willRefresh) {
62 styledItem.refresh()
42 styledItem.refresh()
63 willRefresh = false
43 willRefresh = false
64− } else if (timerEnabled) {
65− if (minimumPullThreshold + styledItem.target.contentY < 0) {
66− timer.start()
67− } else {
68− pullToRefreshScopeStyle.stopTimer()
69− }
70 }
44 }
71 }
45 }
72 }
46 }