@@ -82,6 +82,7 @@ Showable {
8282 property real progress: 0
8383 property bool showingNonFavoriteScope: false
8484 property bool growingDashFromAll: false
85+ property var allScopePosition: undefined
8586 Behavior on progress {
8687 id: progressAnimation
8788 UbuntuNumberAnimation { }
@@ -112,6 +113,19 @@ Showable {
112113 animateDashFromAll();
113114 hide();
114115 }
116+ onAllSelected: {
117+ scopeItem.scope = scopes.getScope(scopeId);
118+ scopeItem.parent = scopesOverviewXYScaler;
119+ scopesOverviewXYScaler.scale = scopesOverview.allCardSize.width / scopesOverviewXYScaler.width;
120+ scopesOverviewXYScaler.x = pos.x -(scopesOverviewXYScaler.width - scopesOverviewXYScaler.width * scopesOverviewXYScaler.scale) / 2;
121+ scopesOverviewXYScaler.y = pos.y -(scopesOverviewXYScaler.height - scopesOverviewXYScaler.height * scopesOverviewXYScaler.scale) / 2;
122+ overviewController.showingNonFavoriteScope = true;
123+ overviewController.allScopePosition = pos;
124+ scopesOverview.overrideOpacity = 0;
125+ scopesOverviewXYScaler.scale = 1;
126+ scopesOverviewXYScaler.x = 0;
127+ scopesOverviewXYScaler.y = 0;
128+ }
115129 function hide() {
116130 overviewController.enableAnimation = true;
117131 overviewController.progress = 0;
@@ -127,22 +141,6 @@ Showable {
127141 scopesOverviewXYScaler.x = 0;
128142 scopesOverviewXYScaler.y = 0;
129143 }
130−
131− Connections {
132− target: scopesOverview.scope
133− onOpenScope: {
134− scopeItem.scope = scope;
135− scopeItem.parent = scopesOverviewXYScaler;
136− scopesOverviewXYScaler.scale = scopesOverview.allCardSize.width / scopesOverviewXYScaler.width;
137− scopesOverviewXYScaler.x = scopesOverview.allScopeClickedPos.x -(scopesOverviewXYScaler.width - scopesOverviewXYScaler.width * scopesOverviewXYScaler.scale) / 2;
138− scopesOverviewXYScaler.y = scopesOverview.allScopeClickedPos.y -(scopesOverviewXYScaler.height - scopesOverviewXYScaler.height * scopesOverviewXYScaler.scale) / 2;
139− overviewController.showingNonFavoriteScope = true;
140− scopesOverview.overrideOpacity = 0;
141− scopesOverviewXYScaler.scale = 1;
142− scopesOverviewXYScaler.x = 0;
143− scopesOverviewXYScaler.y = 0;
144− }
145− }
146144 }
147145
148146 DashContent {
@@ -216,8 +214,8 @@ Showable {
216214 if (overviewController.showingNonFavoriteScope) {
217215 var v = scopesOverview.allCardSize.width / scopeItem.width;
218216 scopesOverviewXYScaler.scale = v;
219− scopesOverviewXYScaler.x = scopesOverview.allScopeClickedPos.x -(scopeItem.width - scopeItem.width * v) / 2;
220− scopesOverviewXYScaler.y = scopesOverview.allScopeClickedPos.y -(scopeItem.height - scopeItem.height * v) / 2;
217+ scopesOverviewXYScaler.x = overviewController.allScopePosition.x -(scopeItem.width - scopeItem.width * v) / 2;
218+ scopesOverviewXYScaler.y = overviewController.allScopePosition.y -(scopeItem.height - scopeItem.height * v) / 2;
221219 scopesOverview.overrideOpacity = -1;
222220 } else {
223221 closeOverlayScope();