git.iko.soy/unity8
on xenial help sign in
Close overview temp scope on show dash Fixes: 1373819

Approved by: Daniel d'Andrada

commit505f8890f9bc648df07586bc047c3482d3f59392 authorAlbert Astals <albert.astals@canonical.com> dateThu 9 Oct 2014, 14:02 (12 years ago) parentcc2ec9b51f8733
2 files changed+10−1
compare with xenial
unifiedsplit
qml/Dash/Dash.qml+2−1 qml/Dash/ScopesOverview.qml+8
qml/Dash/Dash.qml+2−1
@@ -41,8 +41,9 @@ Showable {
4141 if (window.active) {
4242 dashContentCache.scheduleUpdate();
4343 }
44− overviewController.enableAnimation = window.active;
44+ overviewController.enableAnimation = window.active && !scopesOverview.showingNonFavoriteScope;
4545 overviewController.progress = 0;
46+ scopesOverview.closeTempScope();
4647 }
4748 }
4849 }
qml/Dash/ScopesOverview.qml+8
@@ -98,6 +98,14 @@ Item {
9898 value: progress === 1
9999 }
100100
101+ function closeTempScope() {
102+ if (tempScopeItem.scope) {
103+ root.scope.closeScope(tempScopeItem.scope);
104+ tempScopeItem.scope = null;
105+ tempScopeItem.backClicked()
106+ }
107+ }
108+
101109 function animateDashFromAll(scopeId) {
102110 var currentScopePos = allScopeCardPosition(scopeId);
103111 if (currentScopePos) {