Unity

Merge lp://qastaging/~macslow/unity/unity.fix-924884 into lp://qastaging/unity

unity.fix-924884
Merge into trunk

Proposed by Mirco Müller on 2012-02-20

Status:

Merged

Approved by:

Andrea Azzarone on 2012-02-20

Approved revision:

no longer in the source branch.

Merged at revision:

1989

Proposed branch:

lp://qastaging/~macslow/unity/unity.fix-924884

Merge into:

lp://qastaging/unity

Diff against target:

476 lines (+70/-239)

5 files modified

plugins/unityshell/src/DashStyle.cpp (+21/-123)
plugins/unityshell/src/DashStyle.h (+4/-6)
plugins/unityshell/src/FilterRatingsButton.cpp (+36/-92)
plugins/unityshell/src/FilterRatingsButton.h (+0/-17)
plugins/unityshell/src/FilterRatingsWidget.cpp (+9/-1)

To merge this branch:

bzr merge lp://qastaging/~macslow/unity/unity.fix-924884

Medium

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Andrea Azzarone (community)			Approve on 2012-02-20
Andrea Cimitan (community)	design	2012-02-20	Approve on 2012-02-20
Review via email: mp+93811@code.qastaging.launchpad.net

Description of the change

Fixed artwork-assets to be correctly cropped to intended size. Replaced procedural vector drawing methods with newly added artwork-textures. Updated sizes and margins to adapt to new artwork. Added FIXME-hint for keyboard-navigation highlight implementation.

Also see size/gap verification in gimp for screenshot of newly implemented rating-stars:
http://people.canonical.com/~mmueller/fix-924884.png

Revision history for this message

Andrea Cimitan (cimi) wrote on 2012-02-20:

The stars are correctly rendered at the moment, what is currently broken in the filter pane is a lot of padding and spacing. Might worth fixing it after those elements gets in

review: Approve (design)

Revision history for this message

Andrea Cimitan (cimi) wrote on 2012-02-20:

(at the moment = with this branch. thanks mirco!)

Revision history for this message

Andrea Azzarone (azzar1) wrote on 2012-02-20:

388 + // FIXME: A small hint for the keyboard-navigation highlight... you can use
389 + // the method...
390 + //
391 + // style.GetStarHighlightIcon()
392 + //
393 + // ... to get the correct texture from the style/theme and use an opacity of
394 + // .5 for blending it over the regular star-textures.
395 + //
396 + //GfxContext.QRP_1Tex(geo_star.x,
397 + // geo_star.y,
398 + // geo_star.width,
399 + // geo_star.height,
400 + // style.GetStarHighlightIcon()->GetDeviceTexture(),
401 + // texxform,
402 + // nux::Color(1.0f, 1.0f, 1.0f, 0.5f));
403 +
404 + geo_star.x += geo_star.width + star_gap;