Unity 8

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

  1. attributeAspectRatio
  2. Merge into trunk
Proposed by Albert Astals Cid on 2015-02-12
Status: Merged
Approved by: Andrea Cimitan on 2015-02-16
Approved revision: 1600
Merged at revision: 1625
Proposed branch: lp:~aacid/unity8/attributeAspectRatio
Merge into: lp:unity8
Diff against target: 58 lines (+8/-0)
4 files modified
plugins/Dash/CardAttributes.qml (+2/-0)
plugins/Dash/CardCreator.js (+3/-0)
qml/Panel/IndicatorItem.qml (+2/-0)
tests/plugins/Dash/cardcreator/6.res (+1/-0)
To merge this branch: bzr merge lp:~aacid/unity8/attributeAspectRatio
Reviewer Review Type Date Requested Status
Michael Zanetti (community) Abstain on 2015-02-24
Andrea Cimitan (community) Approve on 2015-02-16
PS Jenkins bot continuous-integration Needs Fixing on 2015-02-12
Michał Sawicz visual 2015-02-12 Approve on 2015-02-12
Review via email: mp+249472@code.launchpad.net

Commit Message

Preserve the aspect ratio for the card attribute images

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.
lp:~aacid/unity8/attributeAspectRatio updated on 2015-02-12
1598. By Albert Astals Cid on 2015-02-12

Two other places where we want to maintin the AR

PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1598
http://jenkins.qa.ubuntu.com/job/unity8-ci/5302/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1322
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/466
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/467
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/467
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1168
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1320
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1320/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18006

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

review: Needs Fixing (continuous-integration)
Michał Sawicz (saviq) wrote :

Not great. See

https://owncloud.sawicz.net/public.php?service=files&t=0afe9e8a599ef8fef2f2a105e9db357d&path=%2F&files=out.png&download

Battery indicator squashed, and on krillin the title disappeard completely ¿?.

review: Needs Fixing
lp:~aacid/unity8/attributeAspectRatio updated on 2015-02-12
1599. By Albert Astals Cid on 2015-02-12

Protect against SVG

Michał Sawicz (saviq) wrote :

Can you add comments as to why we need to do it this way?

And surely this should not be required to get an icon that preserves the aspect ratio? So a SDK bug is, IMO, in order.

review: Approve (visual)
lp:~aacid/unity8/attributeAspectRatio updated on 2015-02-12
1600. By Albert Astals Cid on 2015-02-12

Add explanations for the width: code

PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1599
http://jenkins.qa.ubuntu.com/job/unity8-ci/5307/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1332
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/471
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/472
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/472
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1175
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1330
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1330/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18017

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

review: Needs Fixing (continuous-integration)
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1600
http://jenkins.qa.ubuntu.com/job/unity8-ci/5311/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1337
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/475
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/476
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/476
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1178
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1335
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1335/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18022

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

review: Needs Fixing (continuous-integration)
Andrea Cimitan (cimi) :
Albert Astals Cid (aacid) :
Andrea Cimitan (cimi) wrote :

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

review: Approve
Michael Zanetti (mzanetti) wrote :

This fails testCardCreator

review: Needs Fixing
lp:~aacid/unity8/attributeAspectRatio updated on 2015-02-24
1601. By Albert Astals Cid on 2015-02-24

Merge

1602. By Albert Astals Cid on 2015-02-24

Fix cardcreator test

Albert Astals Cid (aacid) wrote :

Wops, you're right, fixed

Michael Zanetti (mzanetti) wrote :

> Wops, you're right, fixed

thanks.

review: Abstain

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/Dash/CardAttributes.qml'
2--- plugins/Dash/CardAttributes.qml 2014-11-17 10:09:40 +0000
3+++ plugins/Dash/CardAttributes.qml 2015-02-24 09:06:19 +0000
4@@ -49,6 +49,8 @@
5 Icon {
6 id: icon
7 height: units.gu(2)
8+ // FIXME Workaround for bug https://bugs.launchpad.net/ubuntu/+source/ubuntu-ui-toolkit/+bug/1421293
9+ width: implicitWidth > 0 && implicitHeight > 0 ? (implicitWidth / implicitHeight * height) : implicitWidth
10 source: "icon" in modelData && modelData["icon"] || ""
11 color: grid.color
12 }
13
14=== modified file 'plugins/Dash/CardCreator.js'
15--- plugins/Dash/CardCreator.js 2015-01-22 12:05:43 +0000
16+++ plugins/Dash/CardCreator.js 2015-02-24 09:06:19 +0000
17@@ -224,6 +224,8 @@
18
19 // %1 is used as extra anchors of emblemIcon
20 // %2 is used as color of emblemIcon
21+// FIXME The width code is a
22+// Workaround for bug https://bugs.launchpad.net/ubuntu/+source/ubuntu-ui-toolkit/+bug/1421293
23 var kEmblemIconCode = 'Icon { \n\
24 id: emblemIcon; \n\
25 objectName: "emblemIcon"; \n\
26@@ -235,6 +237,7 @@
27 source: cardData && cardData["emblem"] || ""; \n\
28 color: %2; \n\
29 height: source != "" ? titleLabel.font.pixelSize : 0; \n\
30+ width: implicitWidth > 0 && implicitHeight > 0 ? (implicitWidth / implicitHeight * height) : implicitWidth; \n\
31 }\n';
32
33 // %1 is used as anchors of touchdown effect
34
35=== modified file 'qml/Panel/IndicatorItem.qml'
36--- qml/Panel/IndicatorItem.qml 2014-11-28 17:07:44 +0000
37+++ qml/Panel/IndicatorItem.qml 2015-02-24 09:06:19 +0000
38@@ -95,6 +95,8 @@
39 id: itemImage
40 objectName: "icon"+index
41 height: iconHeight
42+ // FIXME Workaround for bug https://bugs.launchpad.net/ubuntu/+source/ubuntu-ui-toolkit/+bug/1421293
43+ width: implicitWidth > 0 && implicitHeight > 0 ? (implicitWidth / implicitHeight * height) : implicitWidth;
44 source: modelData
45 color: root.color
46 Behavior on color { ColorAnimation { duration: UbuntuAnimation.FastDuration; easing: UbuntuAnimation.StandardEasing } }
47
48=== modified file 'tests/plugins/Dash/cardcreator/6.res'
49--- tests/plugins/Dash/cardcreator/6.res 2014-11-17 10:09:40 +0000
50+++ tests/plugins/Dash/cardcreator/6.res 2015-02-24 09:06:19 +0000
51@@ -106,6 +106,7 @@
52 source: cardData && cardData["emblem"] || "";
53 color: backgroundLoader.active && backgroundLoader.item && root.scopeStyle ? root.scopeStyle.getTextColor(backgroundLoader.item.luminance) : (backgroundLoader.item && backgroundLoader.item.luminance > 0.7 ? Theme.palette.normal.baseText : "white");
54 height: source != "" ? titleLabel.font.pixelSize : 0;
55+ width: implicitWidth > 0 && implicitHeight > 0 ? (implicitWidth / implicitHeight * height) : implicitWidth;
56 }
57
58 ]

Subscribers

People subscribed via source and target branches