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

Bug #1373819

commit5a46acde38c827bef289b7ebfece2793bee67364 authorAlbert Astals <albert.astals@canonical.com> dateTue 30 Sep 2014, 17:55 (12 years ago) parent8580e14
2 files changed+9
compare with xenial
unifiedsplit
qml/Dash/Dash.qml+1 qml/Dash/ScopesOverview.qml+8
qml/Dash/Dash.qml+1
@@ -38,6 +38,7 @@ Showable {
3838 if (overviewController.progress != 0 && window.active) animate = false;
3939 dash.setCurrentScope(scopeId, animate, isSwipe)
4040 if (overviewController.progress != 0) {
41+ scopesOverview.closeTempScope();
4142 if (window.active) {
4243 dashContentCache.scheduleUpdate();
4344 }
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) {