Merge lp://qastaging/~unity-team/unity/unity.fix-noblur into lp://qastaging/unity

Proposed by Jay Taoko
Status: Merged
Approved by: Gord Allott
Approved revision: no longer in the source branch.
Merged at revision: 2226
Proposed branch: lp://qastaging/~unity-team/unity/unity.fix-noblur
Merge into: lp://qastaging/unity
Diff against target: 514 lines (+237/-74)
10 files modified
plugins/unityshell/src/BackgroundEffectHelper.cpp (+86/-0)
plugins/unityshell/src/BackgroundEffectHelper.h (+2/-0)
plugins/unityshell/src/Launcher.cpp (+41/-35)
plugins/unityshell/src/OverlayRenderer.cpp (+28/-26)
plugins/unityshell/src/PanelView.cpp (+12/-4)
plugins/unityshell/src/PlacesGroup.cpp (+0/-2)
plugins/unityshell/src/ResultViewGrid.cpp (+0/-2)
plugins/unityshell/src/ScreenEffectFramebufferObject.cpp (+0/-3)
plugins/unityshell/src/unityshell.cpp (+62/-2)
plugins/unityshell/src/unityshell.h (+6/-0)
To merge this branch: bzr merge lp://qastaging/~unity-team/unity/unity.fix-noblur
Reviewer Review Type Date Requested Status
Gord Allott (community) Approve
Brandon Schaefer (community) Approve
Jason Smith (community) Approve
Review via email: mp+99403@code.qastaging.launchpad.net

Commit message

* Fix for bug #839480
* Fix rendering of the Dash, Launcher and Panel when "NO_BLUR" is selected in CCSM
* Added support to get a none blurred region of the display from BackgroundEffectHelper

Description of the change

* Fix for bug #839480
* Fix rendering of the Dash, Launcher and Panel when "NO_BLUR" is selected in CCSM
* Added support to get a none blurred region of the display from BackgroundEffectHelper

To post a comment you must log in.
Revision history for this message
Jason Smith (jassmith) wrote :

Works fine for me, +1

review: Approve
Revision history for this message
Brandon Schaefer (brandontschaefer) wrote :

One thing, the 'dash_is_open_' in unityshell.cpp isn't correctly handled anymore (There are cases when the dash is open and dash_is_open is false). So there is the launcher_controller->IsOverlayOpen() which will return true if any overlay (hud/dash) is open on any monitor. Or we should add an IsVisible() in the DashController, so we don't have to worry about the dash_is_open boolean being correctly updated.

review: Needs Fixing
Revision history for this message
Gord Allott (gordallott) wrote :

330 + // nux::LayerBlendMode layer_blend_mode = nux::LAYER_BLEND_MODE_OVERLAY;
331 + // if (_menu_view->GetMaximizedWindow() != 0)
332 + // {
333 + // layer_blend_mode = nux::LAYER_BLEND_MODE_NORMAL;
334 + // }
335 +

just a few comments that were added but shouldn't be, lets remove those

review: Needs Fixing
Revision history for this message
Brandon Schaefer (brandontschaefer) wrote :

Fixed those 2 issues, Thanks Jay awesome work! The panel looks soo much better!

Revision history for this message
Brandon Schaefer (brandontschaefer) :
review: Approve
Revision history for this message
Gord Allott (gordallott) :
review: Approve
Revision history for this message
Omer Akram (om26er) wrote :

this branch seems to cause bug 974408

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.