git.iko.soy/unity8
on xenial help sign in
Close overview temp scope on show dash Fixes: 1373819
505f889Albert Astals
qml/Dash/Dash.qml+2−1
compare with xenial
unifiedsplit
@@ -41,8 +41,9 @@ Showable {
41 if (window.active) {
41 if (window.active) {
42 dashContentCache.scheduleUpdate();
42 dashContentCache.scheduleUpdate();
43 }
43 }
44− overviewController.enableAnimation = window.active;
44+ overviewController.enableAnimation = window.active && !scopesOverview.showingNonFavoriteScope;
45 overviewController.progress = 0;
45 overviewController.progress = 0;
46+ scopesOverview.closeTempScope();
46 }
47 }
47 }
48 }
48 }
49 }
qml/Dash/ScopesOverview.qml+8
@@ -98,6 +98,14 @@ Item {
98 value: progress === 1
98 value: progress === 1
99 }
99 }
100
100
101+ function closeTempScope() {
102+ if (tempScopeItem.scope) {
103+ root.scope.closeScope(tempScopeItem.scope);
104+ tempScopeItem.scope = null;
105+ tempScopeItem.backClicked()
106+ }
107+ }
108+
101 function animateDashFromAll(scopeId) {
109 function animateDashFromAll(scopeId) {
102 var currentScopePos = allScopeCardPosition(scopeId);
110 var currentScopePos = allScopeCardPosition(scopeId);
103 if (currentScopePos) {
111 if (currentScopePos) {