on xenial help sign in
Remove contentScale variable

It's never set to anything other than 1

commit69abf4ba6ece8baffc13f0a568d08bb051b184ab authorAlbert Astals <albert.astals@canonical.com> dateTue 7 Oct 2014, 17:30 (12 years ago) parent48f22f3
2 files changed+1−4
qml/Dash/Dash.qml+1−3 qml/Dash/ScopesOverview.qml−1
qml/Dash/Dash.qml+1−3
@@ -29,7 +29,6 @@ Showable {
2929 visible: shown
3030
3131 property string showScopeOnLoaded: "clickscope"
32− property real contentScale: 1.0
3332
3433 DashCommunicatorService {
3534 objectName: "dashCommunicatorService"
@@ -190,7 +189,6 @@ Showable {
190189 dash.showScopeOnLoaded = ""
191190 }
192191 }
193− scale: dash.contentScale
194192 clip: scale != 1.0 || scopeItem.visible || overviewController.progress != 0
195193 Behavior on x {
196194 UbuntuNumberAnimation {
@@ -245,7 +243,7 @@ Showable {
245243 y: overviewController.progress == 0 ? dashContent.y : overviewProgressY
246244 width: parent.width
247245 height: parent.height
248− scale: dash.contentScale * overviewProgressScale
246+ scale: overviewProgressScale
249247 enabled: opacity == 1
250248 opacity: 1 - overviewController.progress
251249 clip: scale != 1.0
qml/Dash/ScopesOverview.qml−1
@@ -531,7 +531,6 @@ Item {
531531
532532 width: parent.width
533533 height: parent.height
534− scale: dash.contentScale
535534 clip: scale != 1.0
536535 visible: scope != null
537536 hasBackAction: true