Merge lp://qastaging/~unity-team/unity/new-dash-blending into lp://qastaging/unity

Proposed by Robert Carr
Status: Merged
Approved by: Robert Carr
Approved revision: no longer in the source branch.
Merged at revision: 2130
Proposed branch: lp://qastaging/~unity-team/unity/new-dash-blending
Merge into: lp://qastaging/unity
Diff against target: 404 lines (+191/-55)
5 files modified
plugins/unityshell/src/BGHash.cpp (+10/-7)
plugins/unityshell/src/Launcher.cpp (+29/-8)
plugins/unityshell/src/OverlayRenderer.cpp (+58/-16)
plugins/unityshell/src/PanelView.cpp (+59/-15)
plugins/unityshell/src/UnityWindowView.cpp (+35/-9)
To merge this branch: bzr merge lp://qastaging/~unity-team/unity/new-dash-blending
Reviewer Review Type Date Requested Status
Robert Carr (community) Approve
Tim Penhey (community) Approve
Jay Taoko (community) Approve
Review via email: mp+94472@code.qastaging.launchpad.net

Commit message

Implement new dash blending algorithm on cards with GLSL support.

Description of the change

Implement the new blending heuristic proposed in: https://bugs.launchpad.net/unity/+bug/865239

Thanks to Cimi for help with this, espescially with tweaking the colors.

Depends on: https://code.launchpad.net/~unity-team/nux/texture-blend/+merge/94596

Rosie and Cimi have signed off.

To post a comment you must log in.
Revision history for this message
Robert Carr (robertcarr) wrote :
Revision history for this message
Tim Penhey (thumper) wrote :

On 24/02/12 12:55, Robert Carr wrote:
> http://i.imgur.com/PvlCO.png
> http://i.imgur.com/yY2yS.png
>
> Screenshots from Cimi

Is it just me, or is the only difference the background ?

I can't tell what has changed at all.

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

> On 24/02/12 12:55, Robert Carr wrote:
> > http://i.imgur.com/PvlCO.png
> > http://i.imgur.com/yY2yS.png
> >
> > Screenshots from Cimi
>
> Is it just me, or is the only difference the background ?
>
> I can't tell what has changed at all.

Open the dash with the current unity, the background color of the dash is different

Revision history for this message
Robert Carr (robertcarr) wrote :

Here is a picture with no color profile that might indicate the blending changes more clearly:
http://i.imgur.com/bxu4p.png . It's really hard to talk about changes like this with our uncalibrated screens...for example Cimis pictures dont look anything like what I see on my screen ? Part of it has to do with browsers doing their own color management :p

I would say its roughly 9000% more purple.

The main point though, is the Overlay blend is more cooperative with heavily white backgrounds, as it blends differently based on the luminosity of the colorization. Overall trying to reduce the amount of white in the background so we have less problems with text.

Try it out :) It's very very noticeable when running it.

Revision history for this message
Robert Carr (robertcarr) wrote :

Also I'm asleep right now.

review: Abstain
Revision history for this message
Tim Penhey (thumper) wrote :

On Fri 24 Feb 2012 14:52:17 NZDT, Robert Carr wrote:
> Review: Abstain
>
> Also I'm asleep right now.

I can tell... your are typing slowly

Revision history for this message
Robert Carr (robertcarr) wrote :
Revision history for this message
Tim Penhey (thumper) wrote :

I'd like to see all arbitrary design constants extract out of the source into at least a const section in a source file, and use the named constants in the source.

I see the same paint code four times with an ifdef in it. Please abstract that into a function.

review: Needs Fixing
Revision history for this message
Robert Carr (robertcarr) wrote :

Yes sorry, waiting until the nux branch finishes (just redid the API again) to clean it all up...not really ready for review yet

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

> Yes sorry, waiting until the nux branch finishes (just redid the API again) to
> clean it all up...not really ready for review yet

Robert, mark the reviews "Work in progress" if they are not ready yet, you save time to reviewers (especially if they reviewed in their spare time, like Tim :-))!

Revision history for this message
Jay Taoko (jaytaoko) wrote :

This work depends on this branch:

https://code.launchpad.net/~unity-team/nux/texture-blend/+merge/94596

The nux branch as been reviewed and approved. Test this branch again before merging.

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

Will do monday morning ;-)

Revision history for this message
Jay Taoko (jaytaoko) :
review: Approve
Revision history for this message
Mikkel Kamstrup Erlandsen (kamstrup) wrote :

Are we sure the saturation is not a bit over the top? On top of a black terminal the dash/switcher bg is nearly black and over lighter backgrounds the color stands out so hard it looks a bit "unreal" or how to put it...

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

Mikkel, we are aware of the different colorization on dark bg. Probably we might want to slightly refine the saturation, but the improvement of this branch is already greately appreciated!

Revision history for this message
Tim Penhey (thumper) wrote :

There are still #ifdefs here, if nux now supports the method please remove them.

Also, since the same drawing code is in a number of places, please extract into a function.

review: Needs Fixing
Revision history for this message
Robert Carr (robertcarr) wrote :

Hi Tim.

The IfDefs are intentional, and not related to Nux. The flow is so that on OpenGL ES2 when we always have GLSL we can avoid having to check at runtime if we are using the GLSL code path. The ifdefs could of course be removed, with the second case gone.

Not sure exactly how you want the drawing code extracted either. If you mean for example, lines 61-83 should be in a function because something similar is used elsewhere (247-271), I suppose that could be done. If we want to introduce three functions which are just, if (GLSL) Blend else DrawTexture using bla method, it should probably be in Nux instead. Jay?

The real problem is that the same window rendering code is replicated across various views, panel, etc...it's not purely a matter of copy paste to solve this at the moment though because of DrawContent, and some coupling with drawing and internal state (like in PanelView) so it doesn't seem like an appropriate time to try and fix that.

Revision history for this message
Tim Penhey (thumper) wrote :

/me sighs.

OK... I relent.

review: Approve
Revision history for this message
Unity Merger (unity-merger) wrote :

No commit message specified.

Revision history for this message
Robert Carr (robertcarr) :
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.