on xenial help sign in
Preview can call openScope so make sure restorePosition and restoreSize are set
commitf02c7e06b1f6733cdd37e9ce60563ca87b1cfe45 authorAlbert Astals <albert.astals@canonical.com> dateMon 21 Jul 2014, 13:26 (12 years ago) parentf82ec3c
1 file changed+11−2
qml/Dash/ScopesOverview.qml+11−2
qml/Dash/ScopesOverview.qml+11−2
@@ -67,8 +67,13 @@ Item {
6767 var itemPos = scopesOverviewXYScaler.restorePosition;
6868 var itemSize = scopesOverviewXYScaler.restoreSize;
6969 scopesOverviewXYScaler.scale = itemSize.width / scopesOverviewXYScaler.width;
70− scopesOverviewXYScaler.x = itemPos.x -(scopesOverviewXYScaler.width - scopesOverviewXYScaler.width * scopesOverviewXYScaler.scale) / 2;
71− scopesOverviewXYScaler.y = itemPos.y -(scopesOverviewXYScaler.height - scopesOverviewXYScaler.height * scopesOverviewXYScaler.scale) / 2;
70+ if (itemPos) {
71+ scopesOverviewXYScaler.x = itemPos.x -(scopesOverviewXYScaler.width - scopesOverviewXYScaler.width * 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+ }
7277 scopesOverviewXYScaler.opacity = 0;
7378 tempScopeItem.scope = scope;
7479 middleItems.overrideOpacity = 0;
@@ -289,6 +294,10 @@ Item {
289294 }
290295 }
291296 onPressAndHold: {
297+ // Preview can call openScope so make sure restorePosition and restoreSize are set
298+ scopesOverviewXYScaler.restorePosition = undefined;
299+ scopesOverviewXYScaler.restoreSize = allCardSize;
300+
292301 previewListView.model = target.model;
293302 previewListView.currentIndex = -1
294303 previewListView.currentIndex = index;