git.iko.soy/unity8
on xenial help sign in
Remove contentScale variable
cc5a1a7Albert Astals
qml/Dash/Dash.qml+1−3
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"
@@ -191,7 +190,6 @@ Showable {
191 dash.showScopeOnLoaded = ""
190 dash.showScopeOnLoaded = ""
192 }
191 }
193 }
192 }
194− scale: dash.contentScale
195 clip: scale != 1.0 || scopeItem.visible || overviewController.progress != 0
193 clip: scale != 1.0 || scopeItem.visible || overviewController.progress != 0
196 Behavior on x {
194 Behavior on x {
197 UbuntuNumberAnimation {
195 UbuntuNumberAnimation {
@@ -246,7 +244,7 @@ Showable {
246 y: overviewController.progress == 0 ? dashContent.y : overviewProgressY
244 y: overviewController.progress == 0 ? dashContent.y : overviewProgressY
247 width: parent.width
245 width: parent.width
248 height: parent.height
246 height: parent.height
249− scale: dash.contentScale * overviewProgressScale
247+ scale: overviewProgressScale
250 enabled: opacity == 1
248 enabled: opacity == 1
251 opacity: 1 - overviewController.progress
249 opacity: 1 - overviewController.progress
252 clip: scale != 1.0
250 clip: scale != 1.0
qml/Dash/ScopesOverview.qml−1
@@ -540,7 +540,6 @@ Item {
540
540
541 width: parent.width
541 width: parent.width
542 height: parent.height
542 height: parent.height
543− scale: dash.contentScale
544 clip: scale != 1.0
543 clip: scale != 1.0
545 visible: scope != null
544 visible: scope != null
546 hasBackAction: true
545 hasBackAction: true