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
37dac80Albert Astals
qml/Dash/Dash.qml+3−1
compare with xenial
unifiedsplit
@@ -91,7 +91,7 @@ Showable {
91 id: scopesOverview
91 id: scopesOverview
92 anchors.fill: parent
92 anchors.fill: parent
93 scope: scopes ? scopes.getScope("scopesOverview") : null
93 scope: scopes ? scopes.getScope("scopesOverview") : null
94− showingNonFavoriteScope: overviewController.showingNonFavoriteScope
94+ enabled: !overviewController.showingNonFavoriteScope
95 progress: overviewController.progress
95 progress: overviewController.progress
96 scopeScale: 1 - overviewController.progress * 0.6
96 scopeScale: 1 - overviewController.progress * 0.6
97 visible: scopeScale != 1
97 visible: scopeScale != 1
@@ -115,6 +115,7 @@ Showable {
115 scopeItem.x = scopesOverview.allScopeClickedPos.x -(scopeItem.width - scopeItem.width * scopeItem.overviewScale) / 2;
115 scopeItem.x = scopesOverview.allScopeClickedPos.x -(scopeItem.width - scopeItem.width * scopeItem.overviewScale) / 2;
116 scopeItem.y = scopesOverview.allScopeClickedPos.y -(scopeItem.height - scopeItem.height * scopeItem.overviewScale) / 2;
116 scopeItem.y = scopesOverview.allScopeClickedPos.y -(scopeItem.height - scopeItem.height * scopeItem.overviewScale) / 2;
117 overviewController.showingNonFavoriteScope = true;
117 overviewController.showingNonFavoriteScope = true;
118+ scopesOverview.overrideOpacity = 0;
118 scopeItem.overviewScale = 1;
119 scopeItem.overviewScale = 1;
119 scopeItem.x = 0;
120 scopeItem.x = 0;
120 scopeItem.y = 0;
121 scopeItem.y = 0;
@@ -209,6 +210,7 @@ Showable {
209 scopeItem.overviewScale = v;
210 scopeItem.overviewScale = v;
210 scopeItem.x = scopesOverview.allScopeClickedPos.x -(scopeItem.width - scopeItem.width * v) / 2;
211 scopeItem.x = scopesOverview.allScopeClickedPos.x -(scopeItem.width - scopeItem.width * v) / 2;
211 scopeItem.y = scopesOverview.allScopeClickedPos.y -(scopeItem.height - scopeItem.height * v) / 2;
212 scopeItem.y = scopesOverview.allScopeClickedPos.y -(scopeItem.height - scopeItem.height * v) / 2;
213+ scopesOverview.overrideOpacity = -1;
212 } else {
214 } else {
213 closeOverlayScope();
215 closeOverlayScope();
214 closePreview();
216 closePreview();
qml/Dash/ScopesOverview.qml+2−4
@@ -32,7 +32,7 @@ Item {
32 }
32 }
33 property int currentIndex: 0
33 property int currentIndex: 0
34 property real scopeScale: 1
34 property real scopeScale: 1
35− property bool showingNonFavoriteScope: false
35+ property real overrideOpacity: -1
36 property QtObject scopeStyle: QtObject {
36 property QtObject scopeStyle: QtObject {
37 property string headerLogo: ""
37 property string headerLogo: ""
38 property color foreground: "white"
38 property color foreground: "white"
@@ -53,8 +53,6 @@ Item {
53 signal favoriteSelected(int index)
53 signal favoriteSelected(int index)
54 signal allSelected(var scope)
54 signal allSelected(var scope)
55
55
56− enabled: !showingNonFavoriteScope
57−
58 DashBackground {
56 DashBackground {
59 anchors.fill: parent
57 anchors.fill: parent
60 Rectangle {
58 Rectangle {
@@ -198,7 +196,7 @@ Item {
198
196
199 scale: index == 0 ? scopeScale : 1
197 scale: index == 0 ? scopeScale : 1
200
198
201− opacity: root.showingNonFavoriteScope ? 0 : tabBarHolder.currentTab == index ? 1 : 0
199+ opacity: root.overrideOpacity >= 0 ? root.overrideOpacity : tabBarHolder.currentTab == index ? 1 : 0
202 Behavior on opacity { UbuntuNumberAnimation { } }
200 Behavior on opacity { UbuntuNumberAnimation { } }
203 enabled: opacity == 1
201 enabled: opacity == 1
204
202