Unity 8

Merge lp:~aacid/unity8/noDashContentScale into lp:unity8

  1. noDashContentScale
  2. Merge into trunk
Proposed by Albert Astals Cid
Status: Merged
Approved by: Michał Sawicz
Approved revision: 1335
Merged at revision: 1349
Proposed branch: lp:~aacid/unity8/noDashContentScale
Merge into: lp:unity8
Diff against target: 40 lines (+1/-4)
2 files modified
qml/Dash/Dash.qml (+1/-3)
qml/Dash/ScopesOverview.qml (+0/-1)
To merge this branch: bzr merge lp:~aacid/unity8/noDashContentScale
Reviewer Review Type Date Requested Status
Michał Sawicz Approve
PS Jenkins bot (community) continuous-integration Needs Fixing
Review via email: mp+237626@code.launchpad.net

Commit message

Remove contentScale variable

It's never set to anything other than 1

Description of the change

 * Are there any related MPs required for this MP to build/function as expected?
No

 * Did you perform an exploratory manual test run of your code change and any related functionality?
Yes

 * Did you make sure that your branch does not contain spurious tags?
Yes

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A

 * If you changed the UI, has there been a design review?
N/A

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1335
http://jenkins.qa.ubuntu.com/job/unity8-ci/4544/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5683/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1529/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1640
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1638
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6935/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/4544/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1335
http://jenkins.qa.ubuntu.com/job/unity8-ci/4555/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5713
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1541
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1651
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1649
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5377
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6965
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6965/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14377

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/4555/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1335
http://jenkins.qa.ubuntu.com/job/unity8-ci/4578/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5742
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1564
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1674
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1672
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5401
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6994
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6994/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14406

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/4578/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Michał Sawicz (saviq) wrote :

 * Did you perform an exploratory manual test run of the code change and any related functionality?
Y
 * Did CI run pass? If not, please explain why.
Flaky autopilot
 * Did you make sure that the branch does not contain spurious tags?
Y

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'qml/Dash/Dash.qml'
--- qml/Dash/Dash.qml 2014-10-06 08:00:45 +0000
+++ qml/Dash/Dash.qml 2014-10-08 16:07:38 +0000
@@ -29,7 +29,6 @@
29 visible: shown29 visible: shown
3030
31 property string showScopeOnLoaded: "clickscope"31 property string showScopeOnLoaded: "clickscope"
32 property real contentScale: 1.0
3332
34 DashCommunicatorService {33 DashCommunicatorService {
35 objectName: "dashCommunicatorService"34 objectName: "dashCommunicatorService"
@@ -190,7 +189,6 @@
190 dash.showScopeOnLoaded = ""189 dash.showScopeOnLoaded = ""
191 }190 }
192 }191 }
193 scale: dash.contentScale
194 clip: scale != 1.0 || scopeItem.visible || overviewController.progress != 0192 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 @@
245 y: overviewController.progress == 0 ? dashContent.y : overviewProgressY243 y: overviewController.progress == 0 ? dashContent.y : overviewProgressY
246 width: parent.width244 width: parent.width
247 height: parent.height245 height: parent.height
248 scale: dash.contentScale * overviewProgressScale246 scale: overviewProgressScale
249 enabled: opacity == 1247 enabled: opacity == 1
250 opacity: 1 - overviewController.progress248 opacity: 1 - overviewController.progress
251 clip: scale != 1.0249 clip: scale != 1.0
252250
=== modified file 'qml/Dash/ScopesOverview.qml'
--- qml/Dash/ScopesOverview.qml 2014-09-18 21:23:55 +0000
+++ qml/Dash/ScopesOverview.qml 2014-10-08 16:07:38 +0000
@@ -531,7 +531,6 @@
531531
532 width: parent.width532 width: parent.width
533 height: parent.height533 height: parent.height
534 scale: dash.contentScale
535 clip: scale != 1.0534 clip: scale != 1.0
536 visible: scope != null535 visible: scope != null
537 hasBackAction: true536 hasBackAction: true

Subscribers

People subscribed via source and target branches