on xenial help sign in
remove timer
commit0e8ba218c658b33cf117c2a335b1149e2ca73a0e authorAndrea Cimitan <andrea.cimitan@gmail.com> dateTue 7 Jun 2016, 15:17 (10 years ago) parent498c00c
2 files changed+2−30
qml/Dash/GenericScopeView.qml+1−3 qml/Dash/PullToRefreshScopeStyle.qml+1−27
qml/Dash/GenericScopeView.qml+1−3
@@ -732,9 +732,7 @@ FocusScope {
732732
733733 style: PullToRefreshScopeStyle {
734734 anchors.fill: parent
735− activationThreshold: units.gu(14)
736− timerEnabled: activationThreshold > scopeView.height / 3
737− minimumPullThreshold: units.gu(5)
735+ activationThreshold: Math.min(units.gu(14), scopeView.height / 5)
738736 }
739737 }
740738 }
qml/Dash/PullToRefreshScopeStyle.qml+1−27
@@ -25,24 +25,8 @@ import Ubuntu.Components.Styles 1.3
2525 */
2626PullToRefreshStyle {
2727 id: pullToRefreshScopeStyle
28− property bool timerEnabled: false
29− property bool timerTriggered: false
30− property int minimumPullThreshold
3128
32− releaseToRefresh: timerTriggered || 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− }
29+ releaseToRefresh: styledItem.target.originY - styledItem.target.contentY > activationThreshold
4630
4731 Connections {
4832 property bool willRefresh: false
@@ -52,21 +36,11 @@ PullToRefreshStyle {
5236 if (!styledItem.target.dragging && releaseToRefresh) {
5337 willRefresh = true
5438 }
55−
56− if (timerEnabled && !styledItem.target.dragging) {
57− pullToRefreshScopeStyle.stopTimer()
58− }
5939 }
6040 onContentYChanged: {
6141 if (styledItem.target.originY - styledItem.target.contentY == 0 && willRefresh) {
6242 styledItem.refresh()
6343 willRefresh = false
64− } else if (timerEnabled) {
65− if (minimumPullThreshold + styledItem.target.contentY < 0) {
66− timer.start()
67− } else {
68− pullToRefreshScopeStyle.stopTimer()
69− }
7044 }
7145 }
7246 }