@@ -22,6 +22,8 @@ import "../Components"
2222Item {
2323 id: root
2424
25+ property alias scopesListFlickable: scopesListFlickable
26+
2527 // Properties set by parent
2628 property var scope: null
2729
@@ -35,11 +37,98 @@ Item {
3537 signal requestFavoriteMoveTo(string scopeId, int index)
3638 signal requestRestore(string scopeId)
3739
38− state: "browse"
40+ Item {
41+ id: autoscroller
42+
43+ property bool dragging: false
44+ property var dragItem: new Object();
45+
46+ readonly property bool fuzzyAtYEnd: {
47+ var contentHeight = root.scopesListFlickable.contentHeight
48+ var contentY = root.scopesListFlickable.contentY
49+ var dragItemHeight = dragItem ? autoscroller.dragItem.height : 0
50+ var flickableHeight = root.scopesListFlickable.height
51+
52+ if (!dragItem) {
53+ return true;
54+ } else {
55+ return contentY >= (contentHeight - flickableHeight) - dragItemHeight
56+ }
57+ }
58+
59+ readonly property real bottomBoundary: {
60+ var contentHeight = root.scopesListFlickable.contentHeight
61+ var contentY = root.scopesListFlickable.contentY
62+ var dragItemHeight = dragItem ? autoscroller.dragItem.height : 0
63+ var heightRatio = root.scopesListFlickable.visibleArea.heightRatio
64+
65+ if (!dragItem) {
66+ return true;
67+ } else {
68+ return (heightRatio * contentHeight) -
69+ (1.5 * dragItemHeight) + contentY
70+ }
71+ }
72+
73+ readonly property int delayMs: 32
74+ readonly property real topBoundary: dragItem ? root.scopesListFlickable.contentY + (.5 * dragItem.height) : 0
75+
76+ visible: false
77+ readonly property real maxStep: units.dp(10)
78+ function stepSize(scrollingUp) {
79+ var delta, step;
80+ if (scrollingUp) {
81+ delta = dragItem.y - topBoundary;
82+ delta /= (1.5 * dragItem.height);
83+ } else {
84+ delta = dragItem.y - bottomBoundary;
85+ delta /= (1.5 * dragItem.height);
86+ }
87+
88+ step = Math.abs(delta) * autoscroller.maxStep
89+ return Math.ceil(step);
90+ }
91+
92+
93+ Timer {
94+ interval: autoscroller.delayMs
95+ running: autoscroller.dragItem ? (autoscroller.dragging &&
96+ autoscroller.dragItem.y < autoscroller.topBoundary &&
97+ !root.scopesListFlickable.atYBeginning) : false
98+ repeat: true
99+ onTriggered: {
100+ root.scopesListFlickable.contentY -= autoscroller.stepSize(true);
101+ autoscroller.dragItem.y -= autoscroller.stepSize(true);
102+ }
103+ }
104+
105+ Timer {
106+ interval: autoscroller.delayMs
107+ running: autoscroller.dragItem ? (autoscroller.dragging &&
108+ autoscroller.dragItem.y >= autoscroller.bottomBoundary &&
109+ !autoscroller.fuzzyAtYEnd) : false
110+ repeat: true
111+ onTriggered: {
112+ root.scopesListFlickable.contentY += autoscroller.stepSize(false);
113+ autoscroller.dragItem.y += autoscroller.stepSize(false);
114+ }
115+ }
116+ }
39117
40− property var scopeStyle: ScopeStyle {
118+ function autoscroll(dragging, dragItem) {
119+ if (dragging) {
120+ autoscroller.dragItem = dragItem
121+ autoscroller.dragging = true;
122+ } else {
123+ autoscroller.dragItem = null;
124+ autoscroller.dragging = false
125+ }
41126 }
42127
128+ state: "browse"
129+
130+ property var scopeStyle: ScopeStyle {}
131+
43132 onStateChanged: {
44133 if (state == "edit") {
45134 // As per design entering edit mode clears the possible existing search
@@ -73,7 +162,8 @@ Item {
73162 z: 1
74163 }
75164
76− Flickable {
165+ ListView {
166+ id: scopesListFlickable
77167 objectName: "scopesListFlickable"
78168 anchors {
79169 top: header.bottom
@@ -82,43 +172,34 @@ Item {
82172 right: parent.right
83173 }
84174 clip: true
85− contentWidth: root.width
86− contentHeight: column.height
87− onContentHeightChanged: returnToBounds();
88− Column {
89− id: column
90− Repeater {
91− model: scope ? scope.categories : null
92−
93− delegate: Loader {
94− asynchronous: true
95− width: root.width
96− active: results.count > 0
97− visible: active
98− sourceComponent: ScopesListCategory {
99− objectName: "scopesListCategory" + categoryId
100−
101− model: results
102−
103− title: {
104− if (isFavoritesFeed) return i18n.tr("Home");
105− else if (isAlsoInstalled) return i18n.tr("Also installed");
106− else return name;
107− }
108−
109− editMode: root.state == "edit"
110−
111− scopeStyle: root.scopeStyle
112− isFavoritesFeed: categoryId == "favorites"
113− isAlsoInstalled: categoryId == "other"
114−
115− onRequestFavorite: root.requestFavorite(scopeId, favorite);
116− onRequestEditMode: root.state = "edit";
117− onRequestScopeMoveTo: root.requestFavoriteMoveTo(scopeId, index);
118− onRequestActivate: root.scope.activate(result, categoryId);
119− onRequestRestore: root.requestRestore(scopeId);
175+ model: scope ? scope.categories : null
176+ delegate: Loader {
177+ asynchronous: true
178+ width: root.width
179+ active: results.count > 0
180+ visible: active
181+ sourceComponent: ScopesListCategory {
182+ objectName: "scopesListCategory" + categoryId
183+
184+ model: results
185+
186+ title: {
187+ if (isFavoritesFeed) return i18n.tr("Home");
188+ else if (isAlsoInstalled) return i18n.tr("Also installed");
189+ else return name;
120190 }
121− }
191+
192+ editMode: root.state == "edit"
193+ scopeStyle: root.scopeStyle
194+ isFavoritesFeed: categoryId == "favorites"
195+ isAlsoInstalled: categoryId == "other"
196+
197+ onItemDragging: autoscroll(dragging, dragItem);
198+ onRequestFavorite: root.requestFavorite(scopeId, favorite);
199+ onRequestEditMode: root.state = "edit";
200+ onRequestScopeMoveTo: root.requestFavoriteMoveTo(scopeId, index);
201+ onRequestActivate: root.scope.activate(result, categoryId);
202+ onRequestRestore: root.requestRestore(scopeId);
122203 }
123204 }
124205 }