075f2a4 · unity8 · git.iko.soy

Do the overview temp closing later to prevent a quick show of the overview and don't animate either if we are on the overview temp scope

075f2a4Albert Astals12 years ago

qml/Dash/Dash.qml+2−2

@@ -38,12 +38,12 @@ Showable {

38 if (overviewController.progress != 0 && window.active) animate = false;

39 dash.setCurrentScope(scopeId, animate, isSwipe)

40 if (overviewController.progress != 0) {

41− scopesOverview.closeTempScope();

42 if (window.active) {

41 if (window.active) {

43 dashContentCache.scheduleUpdate();

42 dashContentCache.scheduleUpdate();

44 }

43 }

45− overviewController.enableAnimation = window.active;

44+ overviewController.enableAnimation = window.active && !scopesOverview.showingNonFavoriteScope;

46 overviewController.progress = 0;

45 overviewController.progress = 0;

46+ scopesOverview.closeTempScope();

47 }

48 }

49 }