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

[Christopher Townsend]

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().

= 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().

[Brandon Schaefer (brandontschaefer)]

LGTM

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3527
http://jenkins.qa.ubuntu.com/job/unity-ci/381/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-amd64-ci/270
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-armhf-ci/268
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-i386-ci/269

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-ci/381/rebuild

review: Approve (continuous-integration)

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2013-09-18 14:38:47 +0000
+++ plugins/unityshell/src/unityshell.cpp	2013-09-20 18:35:53 +0000
@@ -1367,7 +1367,12 @@
   CompRegion region(geo.x, geo.y, geo.width, geo.height);
 
   if (damage.intersects(region))
-    view->NeedSoftRedraw();
+  {
+    if (view->IsViewWindow())
+      view->QueueDraw();
+    else
+      view->NeedSoftRedraw();
+  }
 }
 
 void UnityScreen::compizDamageNux(CompRegion const& damage)