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

[Christopher Townsend]

Move the _compute_blur_bkg bool to the Tooltip::Draw() method since the CairoBaseWindow::Draw() method sets this to false causing subsequent draws to never update the background texture.

= Issue =
Tooltips do not have active blur which is visually inconsistent.

= Fix =
Move the _compute_blur_bkg bool to the Tooltip::Draw() method since the CairoBaseWindow::Draw() method sets this to false causing subsequent draws to never update the background texture.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3495
http://jenkins.qa.ubuntu.com/job/unity-ci/337/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-amd64-ci/226
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-armhf-ci/224
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-i386-ci/225

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

review: Approve (continuous-integration)

[Brandon Schaefer (brandontschaefer)]

LGTM

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-autolanding/252/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/generic-cleanup-mbs/2122/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-amd64-autolanding/208/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-armhf-autolanding/208/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-i386-autolanding/208/console

review: Needs Fixing (continuous-integration)

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

Ok

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'launcher/Tooltip.cpp'
--- launcher/Tooltip.cpp	2012-12-14 12:14:34 +0000
+++ launcher/Tooltip.cpp	2013-09-09 18:43:09 +0000
@@ -110,8 +110,6 @@
   int x = _anchorX - PADDING;
   int y = anchor_tip_y - ANCHOR_HEIGHT / 2 - TOP_SIZE - CORNER_RADIUS - PADDING;
 
-  _compute_blur_bkg = true;
-
   SetBaseX(x);
   SetBaseY(y);
 
@@ -123,6 +121,7 @@
 
 void Tooltip::Draw(nux::GraphicsEngine& gfxContext, bool forceDraw)
 {
+  _compute_blur_bkg = true;
   CairoBaseWindow::Draw(gfxContext, forceDraw);
   _tooltip_text->ProcessDraw(gfxContext, forceDraw);
 }