on xenial help sign in
Preview can call openScope so make sure restorePosition and restoreSize are set
f02c7e0Albert Astals
qml/Dash/ScopesOverview.qml+11−2
@@ -67,8 +67,13 @@ Item {
67 var itemPos = scopesOverviewXYScaler.restorePosition;
67 var itemPos = scopesOverviewXYScaler.restorePosition;
68 var itemSize = scopesOverviewXYScaler.restoreSize;
68 var itemSize = scopesOverviewXYScaler.restoreSize;
69 scopesOverviewXYScaler.scale = itemSize.width / scopesOverviewXYScaler.width;
69 scopesOverviewXYScaler.scale = itemSize.width / scopesOverviewXYScaler.width;
70+ if (itemPos) {
70− scopesOverviewXYScaler.x = itemPos.x -(scopesOverviewXYScaler.width - scopesOverviewXYScaler.width * scopesOverviewXYScaler.scale) / 2;
71+ scopesOverviewXYScaler.x = itemPos.x -(scopesOverviewXYScaler.width - scopesOverviewXYScaler.width * scopesOverviewXYScaler.scale) / 2;
71− scopesOverviewXYScaler.y = itemPos.y -(scopesOverviewXYScaler.height - scopesOverviewXYScaler.height * scopesOverviewXYScaler.scale) / 2;
72+ scopesOverviewXYScaler.y = itemPos.y -(scopesOverviewXYScaler.height - scopesOverviewXYScaler.height * scopesOverviewXYScaler.scale) / 2;
73+ } else {
74+ scopesOverviewXYScaler.x = 0;
75+ scopesOverviewXYScaler.y = 0;
76+ }
72 scopesOverviewXYScaler.opacity = 0;
77 scopesOverviewXYScaler.opacity = 0;
73 tempScopeItem.scope = scope;
78 tempScopeItem.scope = scope;
74 middleItems.overrideOpacity = 0;
79 middleItems.overrideOpacity = 0;
@@ -289,6 +294,10 @@ Item {
289 }
294 }
290 }
295 }
291 onPressAndHold: {
296 onPressAndHold: {
297+ // Preview can call openScope so make sure restorePosition and restoreSize are set
298+ scopesOverviewXYScaler.restorePosition = undefined;
299+ scopesOverviewXYScaler.restoreSize = allCardSize;
300+
292 previewListView.model = target.model;
301 previewListView.model = target.model;
293 previewListView.currentIndex = -1
302 previewListView.currentIndex = -1
294 previewListView.currentIndex = index;
303 previewListView.currentIndex = index;