git.iko.soy/unity8
on xenial help sign in
Close temp scope on show dash
5a46acdAlbert Astals
qml/Dash/Dash.qml+1
compare with xenial
unifiedsplit
@@ -38,6 +38,7 @@ Showable {
38 if (overviewController.progress != 0 && window.active) animate = false;
38 if (overviewController.progress != 0 && window.active) animate = false;
39 dash.setCurrentScope(scopeId, animate, isSwipe)
39 dash.setCurrentScope(scopeId, animate, isSwipe)
40 if (overviewController.progress != 0) {
40 if (overviewController.progress != 0) {
41+ scopesOverview.closeTempScope();
41 if (window.active) {
42 if (window.active) {
42 dashContentCache.scheduleUpdate();
43 dashContentCache.scheduleUpdate();
43 }
44 }
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) {