git.iko.soy/unity8
on xenial help sign in
Do not update ranges of GSV if it's being moved around by its parent
38f9e4fAlbert Astals
qml/Dash/DashContent.qml+1
compare with xenial
unifiedsplit
@@ -177,6 +177,7 @@ Item {
177 dashContent.scopeLoaded(item.scope.id)
177 dashContent.scopeLoaded(item.scope.id)
178 item.paginationCount = Qt.binding(function() { return dashContentList.count } )
178 item.paginationCount = Qt.binding(function() { return dashContentList.count } )
179 item.paginationIndex = Qt.binding(function() { return dashContentList.currentIndex } )
179 item.paginationIndex = Qt.binding(function() { return dashContentList.currentIndex } )
180+ item.holdingList = dashContentList;
180 }
181 }
181 Connections {
182 Connections {
182 target: isCurrent ? scope : null
183 target: isCurrent ? scope : null
qml/Dash/GenericScopeView.qml+9
@@ -38,6 +38,7 @@ FocusScope {
38 property int paginationCount: 0
38 property int paginationCount: 0
39 property int paginationIndex: 0
39 property int paginationIndex: 0
40 property alias pageHeaderTotallyVisible: categoryView.pageHeaderTotallyVisible
40 property alias pageHeaderTotallyVisible: categoryView.pageHeaderTotallyVisible
41+ property var holdingList: null
41
42
42 property var scopeStyle: ScopeStyle {
43 property var scopeStyle: ScopeStyle {
43 style: scope ? scope.customizations : {}
44 style: scope ? scope.customizations : {}
@@ -313,8 +314,16 @@ FocusScope {
313 target: scopeView
314 target: scopeView
314 onIsCurrentChanged: rendererLoader.updateRanges();
315 onIsCurrentChanged: rendererLoader.updateRanges();
315 }
316 }
317+ Connections {
318+ target: holdingList
319+ onMovingChanged: if (!moving) rendererLoader.updateRanges();
320+ }
316
321
317 function updateRanges() {
322 function updateRanges() {
323+ if (holdingList && holdingList.moving) {
324+ return;
325+ }
326+
318 if (categoryView.moving) {
327 if (categoryView.moving) {
319 // Do not update the range if we are overshooting up or down, since we'll come back
328 // Do not update the range if we are overshooting up or down, since we'll come back
320 // to the stable position and delete/create items without any reason
329 // to the stable position and delete/create items without any reason