Unity 8

Merge lp:~unity-team/unity8/unity8-fix-mascot into lp:unity8

unity8-fix-mascot
Merge into trunk

Proposed by Michał Karnicki on 2014-01-30

Status:	Merged
Approved by:	Michał Sawicz on 2014-01-30
Approved revision:	677
Merged at revision:	678
Proposed branch:	lp:~unity-team/unity8/unity8-fix-mascot
Merge into:	lp:unity8
Diff against target:	25 lines (+9/-3) 1 file modified qml/Dash/CardHeader.qml (+9/-3)
To merge this branch:	bzr merge lp:~unity-team/unity8/unity8-fix-mascot
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration		Needs Fixing on 2014-01-30
Michał Sawicz		2014-01-30	Approve on 2014-01-30
Review via email: mp+203967@code.launchpad.net

Commit message

CardHeader mascot improvements.

Description of the change

Change CardHeader mascot size and image properties.

http://ubuntuone.com/5SsrLHHadzoZrYb7o8Uz7g

Default Image fillMode is Strech.
Img1: Mascot looks really bad.
Img2: Adds PreserveAspectCrop
Img3: Change size and aspect ratio along the 'future dash' spec.
Blur effect will be fixed when Saviq backports this:
https://bugs.launchpad.net/unity-lens-applications/+bug/1271158

Are there any related MPs required for this MP to build/function as expected? Please list.
* No.
Did you perform an exploratory manual test run of your code change and any related functionality?
* Yes, as well as run Card and CardHeader tests.
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?
* Changed UI, based on feedback from Katie. Reviewed by Katie.

lp:~unity-team/unity8/unity8-fix-mascot updated on 2014-01-30

674. By Michał Karnicki on 2014-01-30: Merged trunk.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-01-30:

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

review: Needs Fixing (continuous-integration)

lp:~unity-team/unity8/unity8-fix-mascot updated on 2014-01-30

675. By Michał Karnicki on 2014-01-30: Fix whitespace.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-01-30:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-01-30:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Michał Sawicz (saviq) wrote on 2014-01-30:

21 + sourceSize {
22 + width: mascotShape.maxSize
23 + height: mascotShape.maxSize
24 + }

Flatten, please - does not really help readability, IMO.

=====

14 + readonly property int maxSize: Math.max(width, height)

I wonder if it's more expensive to keep this property than to just use Math.max() directly in sourceSize... But let's leave it be.

=====

26 + horizontalAlignment: Image.AlignHCenter

verticalAlignment: Image.AlignVCenter, too

=====

Truth be told I wouldn't add those tests... They're really just testing visual properties - whether you bound the right value in the right place... And what's more we might allow theming that, at which point the test would become invalid.

Only the sourceSize tests make sense, but I want to replace the Image + Shape with LazyImage, which has that built in, so those would go away.

review: Needs Fixing

lp:~unity-team/unity8/unity8-fix-mascot updated on 2014-01-30

676. By Michał Karnicki on 2014-01-30: Remove tests, per discussion on IRC with Saviq.
677. By Michał Karnicki on 2014-01-30: Typo.

Revision history for this message

Michał Sawicz (saviq) wrote on 2014-01-30:

* 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.
No. Still last two tests failing in otto.

review: Approve

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-01-30:

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

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Mohammad Rakibul Hasan

Unity Team

 === modified file 'qml/Dash/CardHeader.qml'
 --- qml/Dash/CardHeader.qml	2014-01-27 21:23:05 +0000
 +++ qml/Dash/CardHeader.qml	2014-01-30 22:10:52 +0000
@@ -40,13 +40,19 @@
              id: mascotShape
              objectName: "mascotShape"
--            width: units.gu(8)
--            height: units.gu(8)
++            // TODO karni: Icon aspect-ratio is 8:7.5. Revisit these values to avoid fraction of pixels.
++            width: units.gu(6)
++            height: units.gu(5.625)
              visible: image.status === Image.Ready
++            readonly property int maxSize: Math.max(width, height)
              image: Image {
                  id: mascotImage
--                sourceSize { width: mascotShape.width; height: mascotShape.height }
++
++                sourceSize { width: mascotShape.maxSize; height: mascotShape.maxSize }
++                fillMode: Image.PreserveAspectCrop
++                horizontalAlignment: Image.AlignHCenter
++                verticalAlignment: Image.AlignVCenter
+             }
+         }