Merge lp:~azzar1/unity/focus-highlight-category-headers into lp:unity

[Andrea Azzarone]

Implements the new design for the focus/over state for the category headers. Fixes bug #843026 and #919559 too.

For the design review:
[*] http://ubuntuone.com/1clc4aATtV34wTjwD46hXx
[*] http://ubuntuone.com/1wEHHqplJXGYV5qqtpcYCl

P.S: sometimes backward navigation doesn't work. Not my fault. Someone broke it in trunk.

[Alex Launi (alexlauni)]

Needs testing. It should be simple enough to write an autopilot test for this.

review: Needs Fixing

[John Lea (johnlea)]

Reviewed and signed off by design. Thx!

review: Approve (design)

[Andrea Azzarone (azzar1)]

> Needs testing. It should be simple enough to write an autopilot test for this.

We're using the nux key navigation that is already auto-tested. The bug #843026 was caused by a uninitialized variable...

[Andrea Azzarone (azzar1)]

Added an AP test btw..

[Thomi Richards (thomir-deactivatedaccount)]

Your code has lots of integer literals in it:

30 + width += 19 + 40; // add the left padding and the group plugin padding
362 + _focus_layer = dash::Style::Instance().FocusOverlay(geo.width - 16, kFocusHighlightHeight);
398 + base.x + base.width - 10, base.y + base.height - 1,
408 + geo.x = base.x + 11;
409 + geo.width = base.width - 16;

Can we put these integer literals into a const int? these are just meaningless numbers rigth now.

In IconTExture.cpp, in the constructor, instead of doing this:

_accept_key_nav_focus = false;

please use the class initialiser list.

In the PlacesGroup class, the following methods should all be const:

int GetHeaderHeight()
bool HeaderHasKeyFocus();
bool ShouldBeHighlighted();

All member variables should have a trailing underscore, not a leading one. The style guide says:

"""Variable names are all lowercase, with underscores between words. Class member variables have trailing underscores. For instance: my_exciting_local_variable, my_exciting_member_variable_. """

Please add a docstring to this test:

663 + def test_category_header_keynav(self):

that describes what it's testing.

Overall, this looks good, but there are a few small issues that need to be fixed.

Thanks

review: Needs Fixing

[Andrea Azzarone (azzar1)]

> Your code has lots of integer literals in it:
>
> 30 + width += 19 + 40; // add the left padding and the group plugin
> padding
> 362 + _focus_layer = dash::Style::Instance().FocusOverlay(geo.width - 16,
> kFocusHighlightHeight);
> 398 + base.x + base.width - 10, base.y + base.height - 1,
> 408 + geo.x = base.x + 11;
> 409 + geo.width = base.width - 16;
>

Done.

>
> Can we put these integer literals into a const int? these are just meaningless
> numbers rigth now.
>
> In IconTExture.cpp, in the constructor, instead of doing this:
>
> _accept_key_nav_focus = false;
>
> please use the class initialiser list.
>

Done.

>
> In the PlacesGroup class, the following methods should all be const:
>
> int GetHeaderHeight()
> bool HeaderHasKeyFocus();
> bool ShouldBeHighlighted();
>

Done. Added const to GetExpanded too...

> All member variables should have a trailing underscore, not a leading one. The
> style guide says:
>
> """Variable names are all lowercase, with underscores between words. Class
> member variables have trailing underscores. For instance:
> my_exciting_local_variable, my_exciting_member_variable_. """
>

PlacesGroup use the old style so for the moment I prefer to be consistent.

> Please add a docstring to this test:
>
> 663 + def test_category_header_keynav(self):
>
> that describes what it's testing.
>

Done.

>
>
> Overall, this looks good, but there are a few small issues that need to be
> fixed.
>
> Thanks

Thank you too.

[Thomi Richards (thomir-deactivatedaccount)]

Looks much better, thanks!

review: Approve

=== modified file 'plugins/unityshell/src/DashStyle.cpp'
--- plugins/unityshell/src/DashStyle.cpp	2012-02-07 20:12:24 +0000
+++ plugins/unityshell/src/DashStyle.cpp	2012-02-07 22:51:21 +0000
@@ -1615,7 +1615,7 @@
               width,
               height);
 
-  cairo_set_source_rgba(cr, nux::color::White * 0.50f);
+  cairo_set_source_rgba(cr, nux::Color(1.0f, 1.0f, 1.0f, 0.2f));
   cairo_fill(cr);
 
   // Create the texture layer

=== modified file 'plugins/unityshell/src/DashStyle.h'
--- plugins/unityshell/src/DashStyle.h	2012-02-07 20:12:24 +0000
+++ plugins/unityshell/src/DashStyle.h	2012-02-07 22:51:21 +0000
@@ -192,6 +192,10 @@
   nux::BaseTexture* GetGroupUnexpandIcon();
   nux::BaseTexture* GetGroupExpandIcon();
 
+  // Paddings
+  static const int FILTERS_LEFT_PADDING = 0;
+  static const int FILTERS_RIGHT_PADDING = 8;
+
   sigc::signal<void> changed;
 
 private:

=== modified file 'plugins/unityshell/src/DashView.cpp'
--- plugins/unityshell/src/DashView.cpp	2012-02-07 12:00:04 +0000
+++ plugins/unityshell/src/DashView.cpp	2012-02-07 22:51:21 +0000
@@ -149,6 +149,7 @@
   content_layout_->AddView(lenses_layout_, 1, nux::MINOR_POSITION_LEFT);
 
   home_view_ = new LensView(home_lens_);
+  AddChild(home_view_);
   active_lens_view_ = home_view_;
   lens_views_[home_lens_->id] = home_view_;
   lenses_layout_->AddView(home_view_);
@@ -219,7 +220,7 @@
 
   width = MAX(width, tile_width * 6);
 
-  width += 19 + 32; // add the left padding and the group plugin padding
+  width += 19 + 32 + dash::Style::FILTERS_LEFT_PADDING + dash::Style::FILTERS_RIGHT_PADDING; // add the left padding and the group plugin padding
 
   height = search_bar_->GetGeometry().height;
   height += tile_height * 3;
@@ -375,6 +376,7 @@
   lens_bar_->AddLens(lens);
 
   LensView* view = new LensView(lens);
+  AddChild(view);
   view->SetVisible(false);
   view->uri_activated.connect(sigc::mem_fun(this, &DashView::OnUriActivated));
   lenses_layout_->AddView(view, 1);

=== modified file 'plugins/unityshell/src/FilterBar.cpp'
--- plugins/unityshell/src/FilterBar.cpp	2012-02-04 05:28:23 +0000
+++ plugins/unityshell/src/FilterBar.cpp	2012-02-07 22:51:21 +0000
@@ -139,4 +139,3 @@
 
 } // namespace dash
 } // namespace unity
-

=== modified file 'plugins/unityshell/src/IconTexture.cpp'
--- plugins/unityshell/src/IconTexture.cpp	2012-02-07 07:42:12 +0000
+++ plugins/unityshell/src/IconTexture.cpp	2012-02-07 22:51:21 +0000
@@ -45,6 +45,7 @@
 
 IconTexture::IconTexture(nux::BaseTexture* texture, guint width, guint height)
   : TextureArea(NUX_TRACKER_LOCATION),
+    _accept_key_nav_focus(false),
     _icon_name(NULL),
     _size(height),
     _texture_cached(texture),
@@ -54,12 +55,11 @@
     _opacity(1.0f)
 {
   SetMinMaxSize(width, height);
-
-  _accept_key_nav_focus = false;
 }
 
 IconTexture::IconTexture(const char* icon_name, unsigned int size, bool defer_icon_loading)
   : TextureArea(NUX_TRACKER_LOCATION),
+    _accept_key_nav_focus(false),
     _icon_name(NULL),
     _size(size),
     _texture_width(0),

=== modified file 'plugins/unityshell/src/LensBar.cpp'
--- plugins/unityshell/src/LensBar.cpp	2012-02-07 12:00:04 +0000
+++ plugins/unityshell/src/LensBar.cpp	2012-02-07 22:51:21 +0000
@@ -84,7 +84,7 @@
   icons_.push_back(icon);
   layout_->AddView(icon, 0, nux::eCenter, nux::MINOR_SIZE_FULL);
 
-  icon->mouse_click.connect([&, icon] (int x, int y, unsigned long button, unsigned long keyboard) { SetActive(icon); });
+  icon->mouse_click.connect([&, icon] (int x, int y, unsigned long button, unsigned long keyboard) { SetActive(icon); QueueDraw(); });
   icon->mouse_enter.connect([&] (int x, int y, unsigned long button, unsigned long keyboard) {  QueueDraw(); });
   icon->mouse_leave.connect([&] (int x, int y, unsigned long button, unsigned long keyboard) {  QueueDraw(); });
   icon->mouse_down.connect([&] (int x, int y, unsigned long button, unsigned long keyboard) {  QueueDraw(); });
@@ -100,7 +100,7 @@
   icons_.push_back(icon);
   layout_->AddView(icon, 0, nux::eCenter, nux::eFix);
 
-  icon->mouse_click.connect([&, icon] (int x, int y, unsigned long button, unsigned long keyboard) { SetActive(icon); });
+  icon->mouse_click.connect([&, icon] (int x, int y, unsigned long button, unsigned long keyboard) { SetActive(icon); QueueDraw(); });
   icon->mouse_enter.connect([&] (int x, int y, unsigned long button, unsigned long keyboard) {  QueueDraw(); });
   icon->mouse_leave.connect([&] (int x, int y, unsigned long button, unsigned long keyboard) {  QueueDraw(); });
   icon->mouse_down.connect([&] (int x, int y, unsigned long button, unsigned long keyboard) {  QueueDraw(); });

=== modified file 'plugins/unityshell/src/LensView.cpp'
--- plugins/unityshell/src/LensView.cpp	2012-02-07 12:00:04 +0000
+++ plugins/unityshell/src/LensView.cpp	2012-02-07 22:51:21 +0000
@@ -38,6 +38,7 @@
 namespace
 {
 nux::logging::Logger logger("unity.dash.lensview");
+
 }
 
 // This is so we can access some protected members in scrollview.
@@ -144,8 +145,6 @@
 void LensView::SetupViews()
 {
   layout_ = new nux::HLayout(NUX_TRACKER_LOCATION);
-  
-  layout_->SetHorizontalExternalMargin(8);
 
   scroll_view_ = new LensScrollView(new PlacesVScrollBar(NUX_TRACKER_LOCATION),
                                     NUX_TRACKER_LOCATION);
@@ -164,6 +163,7 @@
   layout_->AddView(fscroll_view_, 1);
 
   fscroll_layout_ = new nux::VLayout();
+  fscroll_layout_->SetLeftAndRightPadding(dash::Style::FILTERS_LEFT_PADDING, dash::Style::FILTERS_RIGHT_PADDING);
   fscroll_view_->SetLayout(fscroll_layout_);
 
   filter_bar_ = new FilterBar();
@@ -214,6 +214,7 @@
                     << ", " << boost::lexical_cast<int>(index) << ")";
 
   PlacesGroup* group = new PlacesGroup();
+  AddChild(group);
   group->SetName(name.c_str());
   group->SetIcon(icon_hint.c_str());
   group->SetExpanded(false);
@@ -345,8 +346,8 @@
   filter_bar_->AddFilter(filter);
 
   int width = dash::Style::Instance().GetTileWidth();
-  fscroll_view_->SetMinimumWidth(width*2);
-  fscroll_view_->SetMaximumWidth(width*2);
+  fscroll_view_->SetMinimumWidth(width * 2 + dash::Style::FILTERS_LEFT_PADDING + dash::Style::FILTERS_RIGHT_PADDING);
+  fscroll_view_->SetMaximumWidth(width * 2 + dash::Style::FILTERS_LEFT_PADDING + dash::Style::FILTERS_RIGHT_PADDING);
 
   can_refine_search = true;
 }

=== modified file 'plugins/unityshell/src/PlacesGroup.cpp'
--- plugins/unityshell/src/PlacesGroup.cpp	2012-02-04 05:28:23 +0000
+++ plugins/unityshell/src/PlacesGroup.cpp	2012-02-07 22:51:21 +0000
@@ -29,8 +29,6 @@
 
 #include "StaticCairoText.h"
 
-#include "Introspectable.h"
-
 #include <sigc++/trackable.h>
 #include <sigc++/signal.h>
 #include <sigc++/functors/ptr_fun.h>
@@ -41,24 +39,61 @@
 #include <glib/gi18n-lib.h>
 
 #include <Nux/Utils.h>
-
+#include <UnityCore/Variant.h>
 #include "DashStyle.h"
 
+namespace unity
+{
 namespace
 {
-const nux::Color kExpandDefaultTextColor(1.0f, 1.0f, 1.0f, 0.5f);
+
+const nux::Color kExpandDefaultTextColor(1.0f, 1.0f, 1.0f, 1.0f);
 const nux::Color kExpandHoverTextColor(1.0f, 1.0f, 1.0f, 1.0f);
-const float kExpandDefaultIconOpacity = 0.5f;
+const float kExpandDefaultIconOpacity = 1.0f;
 const float kExpandHoverIconOpacity = 1.0f;
+
+// Category header highlight
+const int kHighlightHeight = 24;
+const int kHighlightWidthSubtractor = 16;
+const int kHighlightLeftPadding = 11;
+
+// Line Separator
+const int kSeparatorLeftPadding = 16;
+const int kSeparatorWidthSubtractor = 10;
+
+class HeaderView : public nux::View
+{
+public:
+  HeaderView(NUX_FILE_LINE_DECL)
+   : nux::View(NUX_FILE_LINE_PARAM)
+  {
+  }
+
+protected:
+  void Draw(nux::GraphicsEngine& graphics_engine, bool force_draw)
+  {
+  };
+
+  void DrawContent(nux::GraphicsEngine& graphics_engine, bool force_draw)
+  {
+    if (GetLayout())
+      GetLayout()->ProcessDraw(graphics_engine, force_draw);
+  }
+
+  bool AcceptKeyNavFocus()
+  {
+    return false;
+  }
+};
+
 }
 
-namespace unity
-{
 NUX_IMPLEMENT_OBJECT_TYPE(PlacesGroup);
 
 PlacesGroup::PlacesGroup()
   : View(NUX_TRACKER_LOCATION),
-    _child_view(NULL),
+    _child_view(nullptr),
+    _focus_layer(nullptr),
     _idle_id(0),
     _is_expanded(true),
     _n_visible_items_in_unexpand_mode(0),
@@ -69,14 +104,17 @@
 
   _cached_name = NULL;
   _group_layout = new nux::VLayout("", NUX_TRACKER_LOCATION);
-  _group_layout->SetHorizontalExternalMargin(12);
+  _group_layout->SetHorizontalExternalMargin(20);
   _group_layout->SetVerticalExternalMargin(1);
 
   _group_layout->AddLayout(new nux::SpaceLayout(15,15,15,15), 0);
 
+  _header_view = new HeaderView(NUX_TRACKER_LOCATION);
+  _group_layout->AddView(_header_view, 0, nux::MINOR_POSITION_TOP, nux::MINOR_SIZE_FIX);
+
   _header_layout = new nux::HLayout(NUX_TRACKER_LOCATION);
   _header_layout->SetHorizontalInternalMargin(10);
-  _group_layout->AddLayout(_header_layout, 0, nux::MINOR_POSITION_TOP, nux::MINOR_SIZE_FIX);
+  _header_view->SetLayout(_header_layout);
 
   _icon = new IconTexture("", 24);
   _icon->SetMinMaxSize(24, 24);
@@ -85,7 +123,7 @@
   _text_layout = new nux::HLayout(NUX_TRACKER_LOCATION);
   _text_layout->SetHorizontalInternalMargin(15);
   _header_layout->AddLayout(_text_layout, 0, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_MATCHCONTENT);
-  
+
   _name = new nux::StaticCairoText("", NUX_TRACKER_LOCATION);
   _name->SetTextEllipsize(nux::StaticCairoText::NUX_ELLIPSIZE_END);
   _name->SetTextAlignment(nux::StaticCairoText::NUX_ALIGN_LEFT);
@@ -99,9 +137,6 @@
   _expand_label->SetTextEllipsize(nux::StaticCairoText::NUX_ELLIPSIZE_END);
   _expand_label->SetTextAlignment(nux::StaticCairoText::NUX_ALIGN_LEFT);
   _expand_label->SetTextColor(kExpandDefaultTextColor);
-  _expand_label->SetAcceptKeyNavFocus(true);
-  _expand_label->key_nav_focus_activate.connect(sigc::mem_fun(this, &PlacesGroup::OnLabelActivated));
-  _expand_label->key_nav_focus_change.connect(sigc::mem_fun(this, &PlacesGroup::OnLabelFocusChanged));
 
   _expand_layout->AddView(_expand_label, 0, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_FIX);
 
@@ -113,19 +148,27 @@
 
   SetLayout(_group_layout);
 
-  /* don't need to disconnect these signals as they are disconnected when this object destroys the contents */
+  // don't need to disconnect these signals as they are disconnected when this object destroys the contents
+  _header_view->mouse_enter.connect(sigc::mem_fun(this, &PlacesGroup::RecvMouseEnter));
+  _header_view->mouse_leave.connect(sigc::mem_fun(this, &PlacesGroup::RecvMouseLeave));
+  _header_view->mouse_click.connect(sigc::mem_fun(this, &PlacesGroup::RecvMouseClick));
   _icon->mouse_click.connect(sigc::mem_fun(this, &PlacesGroup::RecvMouseClick));
   _icon->mouse_enter.connect(sigc::mem_fun(this, &PlacesGroup::RecvMouseEnter));
   _icon->mouse_leave.connect(sigc::mem_fun(this, &PlacesGroup::RecvMouseLeave));
+  _icon->key_nav_focus_change.connect(sigc::mem_fun(this, &PlacesGroup::OnLabelFocusChanged));
   _name->mouse_click.connect(sigc::mem_fun(this, &PlacesGroup::RecvMouseClick));
   _name->mouse_enter.connect(sigc::mem_fun(this, &PlacesGroup::RecvMouseEnter));
   _name->mouse_leave.connect(sigc::mem_fun(this, &PlacesGroup::RecvMouseLeave));
+  _name->key_nav_focus_change.connect(sigc::mem_fun(this, &PlacesGroup::OnLabelFocusChanged));
   _expand_label->mouse_click.connect(sigc::mem_fun(this, &PlacesGroup::RecvMouseClick));
   _expand_label->mouse_enter.connect(sigc::mem_fun(this, &PlacesGroup::RecvMouseEnter));
   _expand_label->mouse_leave.connect(sigc::mem_fun(this, &PlacesGroup::RecvMouseLeave));
+  _expand_label->key_nav_focus_activate.connect(sigc::mem_fun(this, &PlacesGroup::OnLabelActivated));
+  _expand_label->key_nav_focus_change.connect(sigc::mem_fun(this, &PlacesGroup::OnLabelFocusChanged));
   _expand_icon->mouse_click.connect(sigc::mem_fun(this, &PlacesGroup::RecvMouseClick));
   _expand_icon->mouse_enter.connect(sigc::mem_fun(this, &PlacesGroup::RecvMouseEnter));
   _expand_icon->mouse_leave.connect(sigc::mem_fun(this, &PlacesGroup::RecvMouseLeave));
+  _expand_icon->key_nav_focus_change.connect(sigc::mem_fun(this, &PlacesGroup::OnLabelFocusChanged));
 }
 
 PlacesGroup::~PlacesGroup()
@@ -135,6 +178,8 @@
 
   if (_cached_name != NULL)
     g_free(_cached_name);
+
+  delete _focus_layer;
 }
 
 void
@@ -146,17 +191,9 @@
 void
 PlacesGroup::OnLabelFocusChanged(nux::Area* label, bool has_focus, nux::KeyNavDirection direction)
 {
-  if (_expand_label->HasKeyFocus() || _expand_icon->HasKeyFocus())
-  {
-    _expand_label->SetTextColor(kExpandHoverTextColor);
-    _expand_icon->SetOpacity(kExpandHoverIconOpacity);
-  }
-  else if (!IsMouseInside())
-  {
-    _expand_label->SetTextColor(kExpandDefaultTextColor);
-    _expand_icon->SetOpacity(kExpandDefaultIconOpacity);
-  }
+  QueueDraw();
 }
+
 void
 PlacesGroup::SetName(const char* name)
 {
@@ -248,21 +285,20 @@
 
   _expand_label->SetText(final);
   _expand_label->SetVisible(_n_visible_items_in_unexpand_mode < _n_total_items);
-  _expand_label->SetAcceptKeyNavFocus((_n_visible_items_in_unexpand_mode < _n_total_items) ? true : false);
-
-  if (_expand_label->IsVisible() == false)
-  {
-    if (_expand_icon->IsVisible())
-    {
-      _expand_icon->SetAcceptKeyNavFocus(true);
-      _expand_icon->key_nav_focus_change.connect(sigc::mem_fun(this, &PlacesGroup::OnLabelFocusChanged));
-    }
-  }
-
-  if (_expand_icon->IsVisible() == false)
-  {
-    _expand_icon->SetAcceptKeyNavFocus(false);
-  }
+
+  _icon->SetAcceptKeyNavFocus(false);
+  _name->SetAcceptKeyNavFocus(false);
+  _expand_label->SetAcceptKeyNavFocus(false);
+  _expand_icon->SetAcceptKeyNavFocus(false);
+
+  if (_expand_label->IsVisible())
+    _expand_label->SetAcceptKeyNavFocus(true);
+  else if (_expand_icon->IsVisible())
+    _expand_icon->SetAcceptKeyNavFocus(true);
+  else if (_name->IsVisible())
+    _name->SetAcceptKeyNavFocus(true);
+  else if (_icon->IsVisible())
+    _icon->SetAcceptKeyNavFocus(true);
 
   QueueDraw();
 
@@ -302,39 +338,80 @@
   return FALSE;
 }
 
-void PlacesGroup::Draw(nux::GraphicsEngine& GfxContext,
+long PlacesGroup::ComputeContentSize()
+{
+  long ret = nux::View::ComputeContentSize();
+
+  nux::Geometry const& geo = GetGeometry();
+
+  if (_cached_geometry != geo)
+  {
+    if (_focus_layer)
+      delete _focus_layer;
+
+    _focus_layer = dash::Style::Instance().FocusOverlay(geo.width - kHighlightWidthSubtractor, kHighlightHeight);
+
+    _cached_geometry = geo;
+  }
+
+  return ret;
+}
+
+void PlacesGroup::Draw(nux::GraphicsEngine& graphics_engine,
                        bool                 forceDraw)
 {
-  nux::Geometry base = GetGeometry();
-  GfxContext.PushClippingRectangle(base);
-
-  nux::Color col(0.15f, 0.15f, 0.15f, 0.15f);
+  nux::Geometry const& base = GetGeometry();
+  graphics_engine.PushClippingRectangle(base);
+
+  nux::GetPainter().PaintBackground(graphics_engine, base);
+
+  graphics_engine.GetRenderStates().SetColorMask(true, true, true, false);
+  graphics_engine.GetRenderStates().SetBlend(true);
+  graphics_engine.GetRenderStates().SetPremultipliedBlend(nux::SRC_OVER);
 
   if (_draw_sep)
   {
-    GfxContext.GetRenderStates().SetColorMask(true, true, true, true);
-    GfxContext.GetRenderStates().SetBlend(true);
-    GfxContext.GetRenderStates().SetPremultipliedBlend(nux::SRC_OVER);
-    nux::GetPainter().Draw2DLine(GfxContext,
-                                 base.x + 15, base.y + base.height - 1,
-                                 base.x + base.width - 15, base.y + base.height - 1,
+    nux::Color col(0.15f, 0.15f, 0.15f, 0.15f);
+
+    nux::GetPainter().Draw2DLine(graphics_engine,
+                                 base.x + kSeparatorLeftPadding, base.y + base.height - 1,
+                                 base.x + base.width - kSeparatorWidthSubtractor, base.y + base.height - 1,
                                  col);
   }
 
-  GfxContext.PopClippingRectangle();
+  graphics_engine.GetRenderStates().SetColorMask(true, true, true, true);
+
+  if (ShouldBeHighlighted())
+  {
+    nux::Geometry geo(_header_layout->GetGeometry());
+    geo.x = base.x + kHighlightLeftPadding;
+    geo.width = base.width - kHighlightWidthSubtractor;
+
+    _focus_layer->SetGeometry(geo);
+    _focus_layer->Renderlayer(graphics_engine);
+  }
+
+  graphics_engine.PopClippingRectangle();
 }
 
 void
-PlacesGroup::DrawContent(nux::GraphicsEngine& GfxContext, bool force_draw)
+PlacesGroup::DrawContent(nux::GraphicsEngine& graphics_engine, bool force_draw)
 {
-  nux::Geometry base = GetGeometry();
-  GfxContext.PushClippingRectangle(base);
-
-  _group_layout->ProcessDraw(GfxContext, force_draw);
-  GfxContext.PopClippingRectangle();
+  nux::Geometry const& base = GetGeometry();
+
+  graphics_engine.PushClippingRectangle(base);
+
+  if (ShouldBeHighlighted() && !IsFullRedraw())
+  {
+    nux::GetPainter().PushLayer(graphics_engine, _focus_layer->GetGeometry(), _focus_layer);
+  }
+
+  _group_layout->ProcessDraw(graphics_engine, force_draw);
+
+  graphics_engine.PopClippingRectangle();
 }
 
-void PlacesGroup::PostDraw(nux::GraphicsEngine& GfxContext,
+void PlacesGroup::PostDraw(nux::GraphicsEngine& graphics_engine,
                            bool                 forceDraw)
 {
 }
@@ -349,7 +426,7 @@
 }
 
 bool
-PlacesGroup::GetExpanded()
+PlacesGroup::GetExpanded() const
 {
   return _is_expanded;
 }
@@ -385,22 +462,17 @@
 void
 PlacesGroup::RecvMouseEnter(int x, int y, unsigned long button_flags, unsigned long key_flags)
 {
-  _expand_label->SetTextColor(kExpandHoverTextColor);
-  _expand_icon->SetOpacity(kExpandHoverIconOpacity);
+  QueueDraw();
 }
 
 void
 PlacesGroup::RecvMouseLeave(int x, int y, unsigned long button_flags, unsigned long key_flags)
 {
-  if (!_expand_label->HasKeyFocus())
-  {
-    _expand_label->SetTextColor(kExpandDefaultTextColor);
-    _expand_icon->SetOpacity(kExpandDefaultIconOpacity);
-  }
+  QueueDraw();
 }
 
 int
-PlacesGroup::GetHeaderHeight()
+PlacesGroup::GetHeaderHeight() const
 {
   return _header_layout->GetGeometry().height;
 }
@@ -413,6 +485,20 @@
   QueueDraw();
 }
 
+bool PlacesGroup::HeaderHasKeyFocus() const
+{
+  return (_icon && _icon->HasKeyFocus()) || 
+         (_name && _name->HasKeyFocus()) ||
+         (_expand_label && _expand_label->HasKeyFocus()) || 
+         (_expand_icon && _expand_icon->HasKeyFocus());
+}
+
+bool PlacesGroup::ShouldBeHighlighted() const
+{
+  return (_header_view && _header_view->IsMousePointerInside()) ||
+          HeaderHasKeyFocus();
+}
+
 //
 // Key navigation
 //
@@ -422,4 +508,23 @@
   return false;
 }
 
+//
+// Introspection
+//
+std::string PlacesGroup::GetName() const
+{
+  return "PlacesGroup";
+}
+
+void PlacesGroup::AddProperties(GVariantBuilder* builder)
+{
+  unity::variant::BuilderWrapper wrapper(builder);
+
+  wrapper.add("header-x", _header_view->GetAbsoluteX());
+  wrapper.add("header-y", _header_view->GetAbsoluteY());
+  wrapper.add("header-width", _header_view->GetAbsoluteWidth());
+  wrapper.add("header-height", _header_view->GetAbsoluteHeight());
+  wrapper.add("header-has-keyfocus", HeaderHasKeyFocus());
+}
+
 } // namespace unity

=== modified file 'plugins/unityshell/src/PlacesGroup.h'
--- plugins/unityshell/src/PlacesGroup.h	2012-02-04 05:28:23 +0000
+++ plugins/unityshell/src/PlacesGroup.h	2012-02-07 22:51:21 +0000
@@ -17,8 +17,8 @@
  * Authored by: Gordon Allott <[e-mail]>
  */
 
-#ifndef PLACES_GROUP_H
-#define PLACES_GROUP_H
+#ifndef UNITYSHELL_PLACES_GROUP_H
+#define UNITYSHELL_PLACES_GROUP_H
 
 #include <Nux/Nux.h>
 #include <Nux/VLayout.h>
@@ -28,12 +28,18 @@
 #include <sigc++/sigc++.h>
 
 #include "IconTexture.h"
+#include "Introspectable.h"
 #include "StaticCairoText.h"
 
+namespace nux
+{
+class AbstractPaintLayer;
+}
+
 namespace unity
 {
 
-class PlacesGroup : public nux::View
+class PlacesGroup : public nux::View , public debug::Introspectable
 {
   NUX_DECLARE_OBJECT_TYPE(PlacesGroup, nux::View);
 public:
@@ -47,7 +53,7 @@
   nux::StaticCairoText* GetLabel();
   nux::StaticCairoText* GetExpandLabel();
 
-  void       SetChildView(nux::View* view);
+  void SetChildView(nux::View* view);
   nux::View* GetChildView();
 
   void SetChildLayout(nux::Layout* layout);
@@ -57,27 +63,34 @@
   void SetCounts(guint n_visible_items_in_unexpand_mode, guint n_total_items);
 
   void SetExpanded(bool is_expanded);
-  bool GetExpanded();
+  bool GetExpanded() const;
 
-  int  GetHeaderHeight();
+  int  GetHeaderHeight() const;
 
   void SetDrawSeparator(bool draw_it);
 
   sigc::signal<void, PlacesGroup*> expanded;
 
 protected:
+  long ComputeContentSize();
+  void Draw(nux::GraphicsEngine& graphics_engine, bool force_draw);
+  void DrawContent(nux::GraphicsEngine& graphics_engine, bool force_draw);
+  void PostDraw (nux::GraphicsEngine &graphics_engine, bool force_draw);
+
   // Key navigation
   virtual bool AcceptKeyNavFocus();
 
+  // Introspection
+  virtual std::string GetName() const;
+  virtual void AddProperties(GVariantBuilder* builder);
+
 private:
   void Refresh();
-
-  void Draw(nux::GraphicsEngine& GfxContext, bool force_draw);
-  void DrawContent(nux::GraphicsEngine& GfxContext, bool force_draw);
-  void PostDraw (nux::GraphicsEngine &GfxContext, bool force_draw);
-
   static gboolean OnIdleRelayout(PlacesGroup* self);
 
+  bool HeaderHasKeyFocus() const;
+  bool ShouldBeHighlighted() const;
+
   void RecvMouseClick(int x, int y, unsigned long button_flags, unsigned long key_flags);
   void RecvMouseEnter(int x, int y, unsigned long button_flags, unsigned long key_flags);
   void RecvMouseLeave(int x, int y, unsigned long button_flags, unsigned long key_flags);
@@ -87,10 +100,12 @@
 
 private:
   nux::VLayout* _group_layout;
+  nux::View* _header_view;
   nux::HLayout* _header_layout;
   nux::HLayout* _text_layout;
   nux::HLayout* _expand_layout;
   nux::View*  _child_view;
+  nux::AbstractPaintLayer* _focus_layer;
 
   IconTexture*          _icon;
   nux::StaticCairoText* _name;
@@ -104,7 +119,7 @@
   guint _n_total_items;
   char* _cached_name;
   bool  _draw_sep;
-
+  nux::Geometry _cached_geometry;
 };
 
 }

=== modified file 'plugins/unityshell/src/SearchBar.cpp'
--- plugins/unityshell/src/SearchBar.cpp	2012-02-07 07:42:12 +0000
+++ plugins/unityshell/src/SearchBar.cpp	2012-02-07 22:51:21 +0000
@@ -166,7 +166,7 @@
     filter_layout_ = new nux::HLayout();
     filter_layout_->SetHorizontalInternalMargin(8);
     filter_layout_->SetHorizontalExternalMargin(6);
-    filter_space_ = new nux::SpaceLayout(100, 10000, 0, 1);
+    filter_space_ = new nux::SpaceLayout(1, 10000, 0, 1);
     filter_layout_->AddLayout(filter_space_, 1);
     filter_layout_->AddView(show_filters_, 0, nux::MINOR_POSITION_CENTER);
 
@@ -181,6 +181,7 @@
 
     layout_->AddView(filter_layout_, 1, nux::MINOR_POSITION_RIGHT, nux::MINOR_SIZE_FULL);
   }
+
   sig_manager_.Add(new Signal<void, GtkSettings*, GParamSpec*>
       (gtk_settings_get_default(),
        "notify::gtk-font-name",

=== modified file 'tests/autopilot/autopilot/emulators/unity.py'
--- tests/autopilot/autopilot/emulators/unity.py	2012-02-07 19:18:45 +0000
+++ tests/autopilot/autopilot/emulators/unity.py	2012-02-07 22:51:21 +0000
@@ -372,3 +372,13 @@
     def reveal_command_lens(self):
         """Reveal the 'run command' lens."""
         self._keyboard.press_and_release('Alt+F2')
+
+    def get_focused_category(self):
+        """Returns the current focused category. """
+        groups = self.get_state("//PlacesGroup[header-has-keyfocus=True]")
+
+        if len(groups) >= 1:
+          return groups[0]
+        else:
+          return None
+        

=== modified file 'tests/autopilot/autopilot/tests/test_dash.py'
--- tests/autopilot/autopilot/tests/test_dash.py	2012-02-07 12:00:04 +0000
+++ tests/autopilot/autopilot/tests/test_dash.py	2012-02-07 22:51:21 +0000
@@ -10,6 +10,7 @@
 
 from autopilot.emulators.unity import Dash
 from autopilot.emulators.X11 import Keyboard
+from autopilot.emulators.X11 import Mouse
 from autopilot.tests import AutopilotTestCase
 from autopilot.glibrunner import GlibRunner
 
@@ -100,6 +101,41 @@
         # ... the lens bar should lose the key focus
         self.assertEqual(self.dash.get_focused_lens_icon(), "")
 
+    def test_category_header_keynav(self):
+          """ This test makes sure that:
+          1. A category header can get the focus.
+          2. A category header stays highlight when it loses the focus
+             and mouse is close to it (but not inside).
+          """
+          self.dash.ensure_hidden()
+          self.dash.reveal_application_lens()
+
+          kb = Keyboard()
+          mouse = Mouse()
+
+          # Make sure that a category have the focus.
+          kb.press_and_release("Down")
+          category = self.dash.get_focused_category()
+          self.assertIsNot(category, None)
+
+          # Make sure that the category is highlighted.
+          self.assertTrue(category['header-is-highlighted'], True)
+
+          # Get the geometry of that category header.
+          x = category['header-x']
+          y = category['header-y']
+          w = category['header-width']
+          h = category['header-height']
+
+          # Move the mouse close the view, and press down.
+          mouse.move(x+w+10, y+h/2, True)
+          sleep(1)
+          kb.press_and_release("Down")
+
+          category = self.dash.get_focused_category()
+          self.assertEqual(category, None)
+          
+