Merge lp:~azzar1/unity/fix-977961 into lp:unity

[Andrea Azzarone]

Lens selection should work when clicking in the rectangle outside of the icon.

UNBLOCK

== Problem ==
Lens selection should work when clicking in the rectangle outside of the icon.

== Fix ==
Now lens bar icons have the same size of the focus highlights.

== Test ==
AP test added.

[Alex Launi (alexlauni)]

Please rename the DashLensBar(DashTestCase) class to DashLensBarTests(DashTestCase):

review: Approve (quality)

[Alex Launi (alexlauni)]

Sorry I hit save too quick/by accident.

Please rename the DashLensBar(DashTestCase) class to DashLensBarTests(DashTestCase):
Move the dash ensure_visible() and the getting of the lensbar into a setUp method. Every other lensbar test will need to do the same thing. Keep tests as clean as possible.

review: Needs Fixing (quality)

[Andrea Azzarone (azzar1)]

Done.

=== modified file 'plugins/unityshell/src/LensBar.cpp'
--- plugins/unityshell/src/LensBar.cpp	2012-04-06 10:50:00 +0000
+++ plugins/unityshell/src/LensBar.cpp	2012-04-10 18:39:25 +0000
@@ -20,7 +20,6 @@
 #include "config.h"
 
 #include "CairoTexture.h"
-#include "DashStyle.h"
 #include "LensBar.h"
 #include "UBusMessages.h"
 #include "UBusWrapper.h"
@@ -34,8 +33,6 @@
 
 nux::logging::Logger logger("unity.dash.lensbar");
 
-const int FOCUS_OVERLAY_WIDTH = 60;
-const int FOCUS_OVERLAY_HEIGHT = 44;
 const int LENSBAR_HEIGHT = 44;
 
 }
@@ -45,20 +42,11 @@
 LensBar::LensBar()
   : nux::View(NUX_TRACKER_LOCATION)
 {
-  InitTheme();
   SetupBackground();
   SetupLayout();
   SetupHomeLens();
 }
 
-void LensBar::InitTheme()
-{
-  if (!focus_layer_)
-  {
-    focus_layer_.reset(Style::Instance().FocusOverlay(FOCUS_OVERLAY_WIDTH, FOCUS_OVERLAY_HEIGHT));
-  }
-}
-
 void LensBar::SetupBackground()
 {
   nux::ROPConfig rop;
@@ -72,7 +60,6 @@
 {
   layout_ = new nux::HLayout(NUX_TRACKER_LOCATION);
   layout_->SetContentDistribution(nux::MAJOR_POSITION_CENTER);
-  layout_->SetSpaceBetweenChildren(40);
   SetLayout(layout_);
 
   SetMinimumHeight(LENSBAR_HEIGHT);
@@ -86,6 +73,7 @@
   icon->active = true;
   icons_.push_back(icon);
   layout_->AddView(icon, 0, nux::eCenter, nux::MINOR_SIZE_FULL);
+  AddChild(icon);
 
   icon->mouse_click.connect([&, icon] (int x, int y, unsigned long button, unsigned long keyboard) { SetActive(icon); QueueDraw(); });
   icon->mouse_down.connect([&] (int x, int y, unsigned long button, unsigned long keyboard) {  QueueDraw(); });
@@ -100,6 +88,7 @@
   lens->visible.changed.connect([icon](bool visible) { icon->SetVisible(visible); } );
   icons_.push_back(icon);
   layout_->AddView(icon, 0, nux::eCenter, nux::eFix);
+  AddChild(icon);
 
   icon->mouse_click.connect([&, icon] (int x, int y, unsigned long button, unsigned long keyboard) { SetActive(icon); QueueDraw(); });
   icon->mouse_down.connect([&] (int x, int y, unsigned long button, unsigned long keyboard) {  QueueDraw(); });
@@ -129,25 +118,6 @@
   bg_layer_->SetGeometry(base);
   nux::GetPainter().RenderSinglePaintLayer(gfx_context, base, bg_layer_.get());
 
-  for (auto icon : icons_)
-  {
-    if (icon->HasKeyFocus() && focus_layer_)
-    {
-      nux::Geometry geo(icon->GetGeometry());
-
-      // Center it
-      geo.x -= (FOCUS_OVERLAY_WIDTH - geo.width) / 2;
-      geo.y -= (FOCUS_OVERLAY_HEIGHT - geo.height) / 2;
-      geo.width = FOCUS_OVERLAY_WIDTH;
-      geo.height = FOCUS_OVERLAY_HEIGHT;
-
-      nux::AbstractPaintLayer* layer = focus_layer_.get();
-
-      layer->SetGeometry(geo);
-      layer->Renderlayer(gfx_context);
-    }
-  }
-
   gfx_context.PopClippingRectangle();
 
   // trigger a redraw of the decoration, as the special masking of the
@@ -166,16 +136,6 @@
   if (!IsFullRedraw())
     nux::GetPainter().PushLayer(gfx_context, bg_layer_->GetGeometry(), bg_layer_.get());
 
-  for (auto icon: icons_)
-  {
-    if (icon->HasKeyFocus() && !IsFullRedraw() && focus_layer_)
-    {
-      nux::AbstractPaintLayer* layer = focus_layer_.get();
-
-      nux::GetPainter().PushLayer(gfx_context, focus_layer_->GetGeometry(), layer);
-    }
-  }
-
   layout_->ProcessDraw(gfx_context, force_draw);
 
   if (!IsFullRedraw())

=== modified file 'plugins/unityshell/src/LensBar.h'
--- plugins/unityshell/src/LensBar.h	2012-04-02 21:04:46 +0000
+++ plugins/unityshell/src/LensBar.h	2012-04-10 18:39:25 +0000
@@ -59,7 +59,6 @@
   sigc::signal<void, std::string const&> lens_activated;
 
 private:
-  void InitTheme();
   void SetupBackground();
   void SetupLayout();
   void SetupHomeLens();
@@ -81,7 +80,6 @@
 
   nux::HLayout* layout_;
   LayerPtr bg_layer_;
-  LayerPtr focus_layer_;
 };
 
 } // namespace dash

=== modified file 'plugins/unityshell/src/LensBarIcon.cpp'
--- plugins/unityshell/src/LensBarIcon.cpp	2012-03-26 22:43:48 +0000
+++ plugins/unityshell/src/LensBarIcon.cpp	2012-04-10 18:39:25 +0000
@@ -16,6 +16,9 @@
  * Authored by: Neil Jagdish Patel <[e-mail]>
  */
 
+#include <UnityCore/Variant.h>
+
+#include "DashStyle.h"
 #include "LensBarIcon.h"
 
 #include "config.h"
@@ -24,6 +27,13 @@
 {
 namespace dash
 {
+namespace
+{
+
+const int FOCUS_OVERLAY_HEIGHT = 44;
+const int FOCUS_OVERLAY_WIDTH = 60;
+
+}
 
 NUX_IMPLEMENT_OBJECT_TYPE(LensBarIcon);
 
@@ -33,10 +43,13 @@
   , active(false)
   , inactive_opacity_(0.4f)
 {
-  SetMinimumWidth(24);
-  SetMaximumWidth(24);
-  SetMinimumHeight(24);
-  SetMaximumHeight(24);
+  SetMinimumWidth(FOCUS_OVERLAY_WIDTH);
+  SetMaximumWidth(FOCUS_OVERLAY_WIDTH);
+  SetMinimumHeight(FOCUS_OVERLAY_HEIGHT);
+  SetMaximumHeight(FOCUS_OVERLAY_HEIGHT);
+
+  focus_layer_.reset(Style::Instance().FocusOverlay(FOCUS_OVERLAY_WIDTH, FOCUS_OVERLAY_HEIGHT));
+  
   SetOpacity(inactive_opacity_);
 
   SetAcceptKeyNavFocus(true);
@@ -54,7 +67,6 @@
   nux::Geometry const& geo = GetGeometry();
 
   gfx_context.PushClippingRectangle(geo);
-
   nux::GetPainter().PaintBackground(gfx_context, geo);
 
   if (!texture())
@@ -63,6 +75,15 @@
     return;
   }
 
+  if (HasKeyFocus() && focus_layer_)
+  {
+    nux::Geometry geo(GetGeometry());
+    nux::AbstractPaintLayer* layer = focus_layer_.get();
+
+    layer->SetGeometry(geo);
+    layer->Renderlayer(gfx_context);
+  }
+
   float opacity = active ? 1.0f : inactive_opacity_;
   int width = 0, height = 0;
   GetTextureSize(&width, &height);
@@ -88,5 +109,19 @@
   QueueDraw();
 }
 
+// Introspectable
+std::string LensBarIcon::GetName() const
+{
+  return "LensBarIcon";
+}
+
+void LensBarIcon::AddProperties(GVariantBuilder* builder)
+{
+  unity::variant::BuilderWrapper wrapper(builder);
+
+  wrapper.add(GetAbsoluteGeometry());
+  wrapper.add("name", id);
+}
+
 }
 }

=== modified file 'plugins/unityshell/src/LensBarIcon.h'
--- plugins/unityshell/src/LensBarIcon.h	2011-08-22 17:02:48 +0000
+++ plugins/unityshell/src/LensBarIcon.h	2012-04-10 18:39:25 +0000
@@ -47,8 +47,15 @@
   void Draw(nux::GraphicsEngine& gfx_context, bool force_draw);
   void OnActiveChanged(bool is_active);
 
+  // Introspectable
+  std::string GetName() const;
+  void AddProperties(GVariantBuilder* builder);
+
 private:
+  typedef std::unique_ptr<nux::AbstractPaintLayer> LayerPtr;
+
   const float inactive_opacity_;
+  LayerPtr focus_layer_;
 };
 
 }

=== modified file 'tests/autopilot/autopilot/emulators/unity/dash.py'
--- tests/autopilot/autopilot/emulators/unity/dash.py	2012-04-05 13:42:53 +0000
+++ tests/autopilot/autopilot/emulators/unity/dash.py	2012-04-10 18:39:25 +0000
@@ -176,6 +176,15 @@
 
 class LensBar(UnityIntrospectionObject):
     """The bar of lens icons at the bottom of the dash."""
+    def get_icon_by_name(self, name):
+        """Get a LensBarIcon child object by it's name. For example, 'home.lens'."""
+        icons = self.get_children_by_type(LensBarIcon)
+        for icon in icons:
+            if icon.name == name:
+                return icon
+
+class LensBarIcon(UnityIntrospectionObject):
+    """A lens icon at the bottom of the dash."""
 
 
 class LensView(UnityIntrospectionObject):

=== modified file 'tests/autopilot/autopilot/tests/test_dash.py'
--- tests/autopilot/autopilot/tests/test_dash.py	2012-04-02 20:18:58 +0000
+++ tests/autopilot/autopilot/tests/test_dash.py	2012-04-10 18:39:25 +0000
@@ -496,3 +496,23 @@
                 expand_label_y = group.expand_label_y + group.expand_label_baseline
                 name_label_y = group.name_label_y + group.name_label_baseline
                 self.assertThat(expand_label_y, Equals(name_label_y))
+
+class DashLensBarTests(DashTestCase):
+    """Tests that the lensbar works well."""
+    def setUp(self):
+        super(DashLensBarTests, self).setUp()
+        self.dash.ensure_visible()
+        self.lensbar = self.dash.view.get_lensbar()
+
+    def test_click_inside_highlight(self):
+        """Lens selection should work when clicking in
+        the rectangle outside of the icon.
+        """
+        app_icon = self.lensbar.get_icon_by_name(u'applications.lens')
+
+        self.mouse.move(app_icon.x, app_icon.y)
+        self.mouse.click()
+
+        sleep(1)
+
+        self.assertEqual(self.lensbar.active_lens, u'applications.lens')