git.iko.soy/unity8
on xenial help sign in
Some simplifications
f5c348cAlbert Astals
qml/Dash/Dash.qml+1−9
compare with xenial
unifiedsplit
@@ -29,7 +29,6 @@ Showable {
29 visible: shown
29 visible: shown
30
30
31 property string showScopeOnLoaded: "clickscope"
31 property string showScopeOnLoaded: "clickscope"
32− property real contentScale: 1.0
33
32
34 DashCommunicatorService {
33 DashCommunicatorService {
35 objectName: "dashCommunicatorService"
34 objectName: "dashCommunicatorService"
@@ -100,7 +99,7 @@ Showable {
100 width: dash.width
99 width: dash.width
101 height: dash.height
100 height: dash.height
102 scopes: scopes
101 scopes: scopes
103− visible: x != -width
102+ visible: x != -width && bottomEdgeController.progress != 1
104 onGotoScope: {
103 onGotoScope: {
105 dash.setCurrentScope(scopeId, true, false);
104 dash.setCurrentScope(scopeId, true, false);
106 }
105 }
@@ -115,8 +114,6 @@ Showable {
115 dash.showScopeOnLoaded = ""
114 dash.showScopeOnLoaded = ""
116 }
115 }
117 }
116 }
118− scale: dash.contentScale
119− clip: scale != 1.0 || scopeItem.visible || bottomEdgeController.progress != 0
120 Behavior on x {
117 Behavior on x {
121 UbuntuNumberAnimation {
118 UbuntuNumberAnimation {
122 onRunningChanged: {
119 onRunningChanged: {
@@ -188,9 +185,6 @@ Showable {
188 {
185 {
189 anchors.fill: scopeItem
186 anchors.fill: scopeItem
190 visible: scopeItem.visible
187 visible: scopeItem.visible
191− parent: scopeItem.parent
192− scale: scopeItem.scale
193− opacity: scopeItem.opacity
194 }
188 }
195
189
196 GenericScopeView {
190 GenericScopeView {
@@ -203,8 +197,6 @@ Showable {
203 y: dashContent.y
197 y: dashContent.y
204 width: parent.width
198 width: parent.width
205 height: parent.height
199 height: parent.height
206− scale: dash.contentScale
207− clip: scale != 1.0
208 visible: scope != null
200 visible: scope != null
209 hasBackAction: true
201 hasBackAction: true
210 isCurrent: visible
202 isCurrent: visible