cf658af · unity8 · git.iko.soy

git.iko.soy/unity8

on xenial help sign in

Let current trunk (whihc has no dash overview backend) out of dash overview

cf658afAlbert Astals12 years ago

qml/Dash/Dash.qml+11−7

compare with xenial

unifiedsplit

@@ -131,13 +131,17 @@ Showable {

131 }

132 function animateDashFromAll() {

133 var currentScopePos = scopesOverview.allScopeCardPosition(dashContent.currentScopeId);

134+ if (currentScopePos) {

134− scopesOverviewXYScaler.scale = scopesOverview.allCardSize.width / scopesOverviewXYScaler.width;

135+ scopesOverviewXYScaler.scale = scopesOverview.allCardSize.width / scopesOverviewXYScaler.width;

135− scopesOverviewXYScaler.x = currentScopePos.x -(scopesOverviewXYScaler.width - scopesOverviewXYScaler.width * scopesOverviewXYScaler.scale) / 2;

136+ scopesOverviewXYScaler.x = currentScopePos.x -(scopesOverviewXYScaler.width - scopesOverviewXYScaler.width * scopesOverviewXYScaler.scale) / 2;

136− scopesOverviewXYScaler.y = currentScopePos.y -(scopesOverviewXYScaler.height - scopesOverviewXYScaler.height * scopesOverviewXYScaler.scale) / 2;

137+ scopesOverviewXYScaler.y = currentScopePos.y -(scopesOverviewXYScaler.height - scopesOverviewXYScaler.height * scopesOverviewXYScaler.scale) / 2;

137− overviewController.growingDashFromAll = true;

138+ overviewController.growingDashFromAll = true;

138− scopesOverviewXYScaler.scale = 1;

139+ scopesOverviewXYScaler.scale = 1;

139− scopesOverviewXYScaler.x = 0;

140+ scopesOverviewXYScaler.x = 0;

140− scopesOverviewXYScaler.y = 0;

141+ scopesOverviewXYScaler.y = 0;

142+ } else {

143+ console.log("Warning: Could not find Dash OverView All card position for scope", dashContent.currentScopeId);

144+ }

141 }

145 }

142 }

146 }

143

147