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

[Christopher Townsend]

Re-enable Quicklist and Tooltip active blurring since it was removed due to the performance merge.

= Issue =
Due to the performance improvement merge, Quicklist and Tooltips active blur was removed.

= Fix =
This re-enables active blurring in a manner similar to what was done before the aforementioned merge.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3602
http://jenkins.qa.ubuntu.com/job/unity-ci/521/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/52
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/52
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/55

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

review: Approve (continuous-integration)

[Marco Trevisan (Treviño) (3v1n0)]

44 + CompRegion region(geo.x, geo.y, geo.width, geo.height);

You can just use

if (damage.intersects(CompRectFromNuxGeo(geo))
...

[Christopher Townsend (townsend)]

Hey Marco,

Ah, yes, thanks for pointing that out. Branch is now updated.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3603
http://jenkins.qa.ubuntu.com/job/unity-ci/522/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/53
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/53
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/56

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

review: Approve (continuous-integration)

[Marco Trevisan (Treviño) (3v1n0)]

+1

review: Approve

=== modified file 'launcher/CairoBaseWindow.cpp'
--- launcher/CairoBaseWindow.cpp	2013-10-29 22:39:42 +0000
+++ launcher/CairoBaseWindow.cpp	2013-12-04 16:08:25 +0000
@@ -69,6 +69,12 @@
   animation::StartOrReverse(fade_animator_, animation::Direction::BACKWARD);
 }
 
+void CairoBaseWindow::RedrawBlur()
+{
+  compute_blur_bkg_ = true;
+  QueueDraw();
+}
+
 bool CairoBaseWindow::HasBlurredBackground() const
 {
   return use_blurred_background_;

=== modified file 'launcher/CairoBaseWindow.h'
--- launcher/CairoBaseWindow.h	2013-10-29 22:39:42 +0000
+++ launcher/CairoBaseWindow.h	2013-12-04 16:08:25 +0000
@@ -36,6 +36,7 @@
   virtual void Show();
   virtual void Hide();
 
+  void RedrawBlur();
   bool HasBlurredBackground() const;
 
 protected:

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2013-11-20 21:39:40 +0000
+++ plugins/unityshell/src/unityshell.cpp	2013-12-04 16:08:25 +0000
@@ -1557,6 +1557,17 @@
   cScreen->donePaint();
 }
 
+void redraw_view_if_damaged(nux::ObjectPtr<CairoBaseWindow> const& view, CompRegion const& damage)
+{
+  if (!view || view->IsRedrawNeeded())
+    return;
+
+  auto const& geo = view->GetAbsoluteGeometry();
+
+  if (damage.intersects(CompRectFromNuxGeo(geo)))
+    view->RedrawBlur();
+}
+
 void UnityScreen::compizDamageNux(CompRegion const& damage)
 {
   /* Ask nux to present anything in our damage region
@@ -1576,6 +1587,21 @@
     auto const& geo = NuxGeometryFromCompRect(r);
     wt->PresentWindowsIntersectingGeometryOnThisFrame(geo);
   }
+  
+  auto const& launchers = launcher_controller_->launchers();
+
+  for (auto const& launcher : launchers)
+  {
+    if (!launcher->Hidden())
+    {
+      redraw_view_if_damaged(launcher->GetActiveTooltip(), damage);
+    }
+  }
+
+  if (QuicklistManager* qm = QuicklistManager::Default())
+  {
+    redraw_view_if_damaged(qm->Current(), damage);
+  }
 }
 
 /* Grab changed nux regions and add damage rects for them */