Merge lp:~nicolas-doffay/unity/fix-lensindicator into lp:unity

[Nicolas d'Offay]

Fixed lens indicator bug appearing when no lens was currently selected. Prior to the fix it was checking whether a lens was active, all lenses were active. It actually needed to check whether a lens currently was both active and visible and only then render the indicator.

Fixed lens indicator bug appearing when no lens was currently selected. Prior to the fix it was checking whether a lens was active, all lenses were active. It actually needed to check whether a lens currently was both active and visible and only then render the indicator.

[Andrea Azzarone (azzar1)]

Can we have a test?

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

Also, I think we should backport this to 5.0 too.

[Tim Penhey (thumper)]

Andrea, since this is a pure visual tweak, I don't think we need a test.

I will however compile it and check :-)

[Tim Penhey (thumper)]

Compiled, and checked.

review: Approve

=== modified file 'dash/LensBar.cpp'
--- dash/LensBar.cpp	2012-05-07 22:28:17 +0000
+++ dash/LensBar.cpp	2012-08-09 14:35:27 +0000
@@ -131,7 +131,7 @@
 
   for (auto icon: icons_)
   {
-    if (icon->active)
+    if (icon->active && icon->IsVisible())
     {
       nux::Geometry const& geo = icon->GetGeometry();
       int middle = geo.x + geo.width/2;
@@ -147,7 +147,6 @@
                                             nux::color::White);
 
       break;
-
     }
   }