git.iko.soy/unity8
on xenial help sign in
when going back from temp scope the opacity animation needs to trigger at the same time of shrinking, not after
commit37dac80a13c6caaf795cbef309536ee48a83a718 authorAlbert Astals <albert.astals@canonical.com> dateMon 14 Jul 2014, 15:49 (12 years ago) parentdd0f9ca
2 files changed+5−5
compare with xenial
unifiedsplit
qml/Dash/Dash.qml+3−1 qml/Dash/ScopesOverview.qml+2−4
qml/Dash/Dash.qml+3−1
@@ -91,7 +91,7 @@ Showable {
9191 id: scopesOverview
9292 anchors.fill: parent
9393 scope: scopes ? scopes.getScope("scopesOverview") : null
94− showingNonFavoriteScope: overviewController.showingNonFavoriteScope
94+ enabled: !overviewController.showingNonFavoriteScope
9595 progress: overviewController.progress
9696 scopeScale: 1 - overviewController.progress * 0.6
9797 visible: scopeScale != 1
@@ -115,6 +115,7 @@ Showable {
115115 scopeItem.x = scopesOverview.allScopeClickedPos.x -(scopeItem.width - scopeItem.width * scopeItem.overviewScale) / 2;
116116 scopeItem.y = scopesOverview.allScopeClickedPos.y -(scopeItem.height - scopeItem.height * scopeItem.overviewScale) / 2;
117117 overviewController.showingNonFavoriteScope = true;
118+ scopesOverview.overrideOpacity = 0;
118119 scopeItem.overviewScale = 1;
119120 scopeItem.x = 0;
120121 scopeItem.y = 0;
@@ -209,6 +210,7 @@ Showable {
209210 scopeItem.overviewScale = v;
210211 scopeItem.x = scopesOverview.allScopeClickedPos.x -(scopeItem.width - scopeItem.width * v) / 2;
211212 scopeItem.y = scopesOverview.allScopeClickedPos.y -(scopeItem.height - scopeItem.height * v) / 2;
213+ scopesOverview.overrideOpacity = -1;
212214 } else {
213215 closeOverlayScope();
214216 closePreview();
qml/Dash/ScopesOverview.qml+2−4
@@ -32,7 +32,7 @@ Item {
3232 }
3333 property int currentIndex: 0
3434 property real scopeScale: 1
35− property bool showingNonFavoriteScope: false
35+ property real overrideOpacity: -1
3636 property QtObject scopeStyle: QtObject {
3737 property string headerLogo: ""
3838 property color foreground: "white"
@@ -53,8 +53,6 @@ Item {
5353 signal favoriteSelected(int index)
5454 signal allSelected(var scope)
5555
56− enabled: !showingNonFavoriteScope
57−
5856 DashBackground {
5957 anchors.fill: parent
6058 Rectangle {
@@ -198,7 +196,7 @@ Item {
198196
199197 scale: index == 0 ? scopeScale : 1
200198
201− opacity: root.showingNonFavoriteScope ? 0 : tabBarHolder.currentTab == index ? 1 : 0
199+ opacity: root.overrideOpacity >= 0 ? root.overrideOpacity : tabBarHolder.currentTab == index ? 1 : 0
202200 Behavior on opacity { UbuntuNumberAnimation { } }
203201 enabled: opacity == 1
204202