Merge lp:~townsend/unity/fix-active-blur-regression into lp:unity

Proposed by Christopher Townsend on 2013-09-20
Status: Merged
Approved by: Brandon Schaefer on 2013-09-20
Approved revision: 3527
Merged at revision: 3527
Proposed branch: lp:~townsend/unity/fix-active-blur-regression
Merge into: lp:unity
Diff against target: 17 lines (+6/-1)
1 file modified
plugins/unityshell/src/unityshell.cpp (+6/-1)
To merge this branch: bzr merge lp:~townsend/unity/fix-active-blur-regression
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve on 2013-09-20
Brandon Schaefer (community) 2013-09-20 Approve on 2013-09-20
Review via email: mp+186856@code.launchpad.net

Commit message

A regression caused by revno. 3515 breaks the recently fixed Quicklist and Tooltip active blur. This fixes it by checking if the View is a ViewWindow and if so, use QueueDraw() instead of NeedSoftRedraw().

Description of the change

= Issue =
A recent commit (revno. 3515) caused a regression in the recently fixed active blur for Quicklists and Tooltips.

= Fix =
The change to use NeedSoftRedraw() did not cause a new draw of the Quicklists or Tooltips, so no updated blur was occurring. Now check if the View is a ViewWindow and if so, use QueueDraw() instead. Otherwise, still use NeedSoftRedraw().

To post a comment you must log in.
Brandon Schaefer (brandontschaefer) wrote :

LGTM

review: Approve
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/unityshell/src/unityshell.cpp'
2--- plugins/unityshell/src/unityshell.cpp 2013-09-18 14:38:47 +0000
3+++ plugins/unityshell/src/unityshell.cpp 2013-09-20 18:35:53 +0000
4@@ -1367,7 +1367,12 @@
5 CompRegion region(geo.x, geo.y, geo.width, geo.height);
6
7 if (damage.intersects(region))
8- view->NeedSoftRedraw();
9+ {
10+ if (view->IsViewWindow())
11+ view->QueueDraw();
12+ else
13+ view->NeedSoftRedraw();
14+ }
15 }
16
17 void UnityScreen::compizDamageNux(CompRegion const& damage)