git.iko.soy/unity8
on xenial help sign in
Remove contentScale variable
69abf4bAlbert 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"
@@ -190,7 +189,6 @@ Showable {
190 dash.showScopeOnLoaded = ""
189 dash.showScopeOnLoaded = ""
191 }
190 }
192 }
191 }
193− scale: dash.contentScale
194 clip: scale != 1.0 || scopeItem.visible || overviewController.progress != 0
192 clip: scale != 1.0 || scopeItem.visible || overviewController.progress != 0
195 Behavior on x {
193 Behavior on x {
196 UbuntuNumberAnimation {
194 UbuntuNumberAnimation {
@@ -245,7 +243,7 @@ Showable {
245 y: overviewController.progress == 0 ? dashContent.y : overviewProgressY
243 y: overviewController.progress == 0 ? dashContent.y : overviewProgressY
246 width: parent.width
244 width: parent.width
247 height: parent.height
245 height: parent.height
248− scale: dash.contentScale * overviewProgressScale
246+ scale: overviewProgressScale
249 enabled: opacity == 1
247 enabled: opacity == 1
250 opacity: 1 - overviewController.progress
248 opacity: 1 - overviewController.progress
251 clip: scale != 1.0
249 clip: scale != 1.0
qml/Dash/ScopesOverview.qml−1
@@ -531,7 +531,6 @@ Item {
531
531
532 width: parent.width
532 width: parent.width
533 height: parent.height
533 height: parent.height
534− scale: dash.contentScale
535 clip: scale != 1.0
534 clip: scale != 1.0
536 visible: scope != null
535 visible: scope != null
537 hasBackAction: true
536 hasBackAction: true