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

Proposed by Mirco Müller
Status: Merged
Approved by: Andrea Azzarone
Approved revision: no longer in the source branch.
Merged at revision: 1872
Proposed branch: lp://qastaging/~macslow/unity/unity.fix-863246-2
Merge into: lp://qastaging/unity
Diff against target: 406 lines (+105/-50)
10 files modified
plugins/unityshell/resources/dash-widgets.json (+2/-2)
plugins/unityshell/src/DashSearchBar.cpp (+8/-4)
plugins/unityshell/src/FilterBar.cpp (+30/-2)
plugins/unityshell/src/FilterBasicButton.cpp (+10/-3)
plugins/unityshell/src/FilterExpanderLabel.cpp (+39/-14)
plugins/unityshell/src/FilterExpanderLabel.h (+5/-1)
plugins/unityshell/src/FilterGenreWidget.cpp (+2/-10)
plugins/unityshell/src/FilterMultiRangeWidget.cpp (+1/-9)
plugins/unityshell/src/FilterRatingsWidget.cpp (+1/-1)
plugins/unityshell/src/PlacesGroup.cpp (+7/-4)
To merge this branch: bzr merge lp://qastaging/~macslow/unity/unity.fix-863246-2
Reviewer Review Type Date Requested Status
Andrea Azzarone (community) Approve
Andrea Cimitan (community) design Approve
Review via email: mp+90247@code.qastaging.launchpad.net

Description of the change

Remaining issues for LP: #863246 (and also LP: #863240) fixed.

See example screenshots of the after-state here:
http://people.canonical.com/~mmueller/fix-863246-863240-1.png
http://people.canonical.com/~mmueller/fix-863246-863240-2.png
http://people.canonical.com/~mmueller/fix-863246-863240-3.png
http://people.canonical.com/~mmueller/fix-863246-863240-4.png

Alignments, margins, colors, opacities, artwork fixed for buttons, separators, outlines, text and expander-arrows.

One glitch remaining is the separator-rendering being too thick/missing occasionally (on some systems). A solution for fixing this, is available. It's reverted in this branch, as some blending issues with this remain. But that can be added afterwards, to avoid all the other fixes being blocked on just that.

To post a comment you must log in.
Revision history for this message
Andrea Cimitan (cimi) wrote :

I would:
- slightly reduce the opacity of the flter border (really subtly, from 0.15 to something like 0.13-0.14)
- make the corners of the linked button selected items rounded (in your screenshot they are squared at the corners)
- the shape of all buttons is not like this https://launchpadlibrarian.net/81538790/file_lens_filters.png (bezier curves) but of a normal rounded rectangle, don't know if design is ok with that

Revision history for this message
Mirco Müller (macslow) wrote :

* filter-opacity can be further tweaked

* "linked button selected items" I really don't know what you mean

* Regarding the button-outline shape... don't "file bugs" on a merge-request comment, but really file a new bug... this LP: 863246 is already a meta-bug much too big

Revision history for this message
Andrea Cimitan (cimi) wrote :

* 0.15 is the value from design, but maybe their dash color is more vibrant and less dark, resulting in less contrast giving the impression of being less opaque. Leave 0.15 by now if we're going to make the dash less dark after gord's fixes, otherwise 0.14

* another issue

* another issue

review: Approve (design)
Revision history for this message
Andrea Azzarone (azzar1) wrote :

54 + for (iter = layout_list.begin(); iter != layout_list.end(); iter++)
55 + {
56 + if (i != num_separators)
57 + {
58 + nux::Area* filter_view = (*iter);
59 + nux::Geometry const& geom = filter_view->GetGeometry();
60 +
61 + unsigned int alpha = 0, src = 0, dest = 0;
62 + GfxContext.GetRenderStates().GetBlend(alpha, src, dest);
63 +
64 + GfxContext.GetRenderStates().SetBlend(true, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
65 + GfxContext.GetRenderStates().SetColorMask(true, true, true, false);
66 + nux::GetPainter().Draw2DLine(GfxContext,
67 + geom.x , geom.y + geom.height - 1,
68 + geom.x + geom.width, geom.y + geom.height - 1,
69 + col);
70 + GfxContext.GetRenderStates().SetBlend(alpha, src, dest);
71 + }
72 + i++;
73 + }

Why not to use the for (auto iter : layout_list) statement?

Please use ++bla intead of bla++ too :)

91 + SetMinimumHeight(30);
92 + SetMinimumWidth(48);

Can we use const variables instead of magic numbers for the moment?

+static const float kExpandDefaultIconOpacity = 1.0f;

Don't make it static, put it in an anonymouse namespace.

review: Needs Fixing
Revision history for this message
Mirco Müller (macslow) wrote :

> 54 + for (iter = layout_list.begin(); iter != layout_list.end(); iter++)
> 55 + {
> 56 + if (i != num_separators)
> 57 + {
> 58 + nux::Area* filter_view = (*iter);
> 59 + nux::Geometry const& geom = filter_view->GetGeometry();
> 60 +
> 61 + unsigned int alpha = 0, src = 0, dest = 0;
> 62 + GfxContext.GetRenderStates().GetBlend(alpha, src, dest);
> 63 +
> 64 + GfxContext.GetRenderStates().SetBlend(true, GL_ONE,
> GL_ONE_MINUS_SRC_ALPHA);
> 65 + GfxContext.GetRenderStates().SetColorMask(true, true, true,
> false);
> 66 + nux::GetPainter().Draw2DLine(GfxContext,
> 67 + geom.x , geom.y +
> geom.height - 1,
> 68 + geom.x + geom.width, geom.y +
> geom.height - 1,
> 69 + col);
> 70 + GfxContext.GetRenderStates().SetBlend(alpha, src, dest);
> 71 + }
> 72 + i++;
> 73 + }
>
> Why not to use the for (auto iter : layout_list) statement?

Using the auto-statement doesn't guarentee one gets the correct (spatial order). Only walking the list with an iter and a common for-statement does that. I'm not sure if that's a bug or feature of the new C++-standard.

>
> Please use ++bla intead of bla++ too :)
>
> 91 + SetMinimumHeight(30);
> 92 + SetMinimumWidth(48);
>
> Can we use const variables instead of magic numbers for the moment?

Fixed.

> +static const float kExpandDefaultIconOpacity = 1.0f;
>
> Don't make it static, put it in an anonymouse namespace.

Fixed.

Revision history for this message
Andrea Azzarone (azzar1) wrote :

Approve!!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.