Merge lp:~azzar1/unity/dash-layout-2 into lp:unity

[Andrea Azzarone]

Fixing current dash layout which doesn't match the wanted design.

Moreover the dash code is full of magic number.

== Problem ==
The current dash layout doesn't match the wanted design. Moreover the dash code is full of magic numbers.

== Fix ==
Moves as many magic numbers as possible in dash::style.

== Test ==
Not applicable.

== Screenshots ==
Don't just rely on screenshots please.

http://ubuntuone.com/07iO3sFR7oscCidptkzqjF
http://ubuntuone.com/3ySdr0iZzvwxqpTxn5Hkbs
http://ubuntuone.com/7S8ES2zOtQ9kTNXy1OIxW4

[Tim Penhey (thumper)]

This is a branch that would have been much easier to review in three different branches:
 * removal of whitespace
 * replacing constants with dash style
 * fixing design bugs

Please think of the reviewers.

  nux::Color color0 = color_;
  color0.alpha = alpha0_;

is not the same as

  nux::Color color0 = color_ * alpha0_;

The first has color0 same r,g,b values as color_ but a different alpha.
The second multiplies all the r,g,b and a values by the alpha.

Apart from that the code looks fine. However can you please add some before and after pictures and get a review from design?

review: Approve

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

Coode looks good (even if you forget there few debug comments or empty spaces :P)

Anyway I was looking at the screenshot, the line separator between the dash and the launcher shouldn't be just gray, but a gray blended with the background average color...

[Andrea Cimitan (cimi)]

I agree with Marco.
Also, the separator line between the panel and the dash is still not fixed: https://bugs.launchpad.net/unity/+bug/926344

[Andrea Cimitan (cimi)]

Happy with the improvement so far, will file a bug for refinements and remaining issues.

review: Approve (design)

[Unity Merger (unity-merger)]

No commit message specified.

[Unity Merger (unity-merger)]

Attempt to merge into lp:unity failed due to conflicts:

text conflict in plugins/unityshell/src/HudView.cpp

[Didier Roche-Tolomelli (didrocks)]

see https://code.launchpad.net/~andyrock/unity/dash-layout-2/+merge/98531 which contains the merge conflicts resolved

[Andrea Azzarone (azzar1)]

> Anyway I was looking at the screenshot, the line separator between the dash and the launcher shouldn't be just gray, but a gray blended with the background average color...

I've just fixed the redrawing problem :)

=== modified file 'plugins/unityshell/src/AbstractPlacesGroup.cpp'
--- plugins/unityshell/src/AbstractPlacesGroup.cpp	2012-03-09 21:52:23 +0000
+++ plugins/unityshell/src/AbstractPlacesGroup.cpp	2012-03-20 23:22:18 +0000
@@ -28,7 +28,7 @@
 
 AbstractPlacesGroup::AbstractPlacesGroup()
   : nux::View(NUX_TRACKER_LOCATION)
-  , draw_separator(true)
+  , draw_separator(false)
 {
 }
 
@@ -40,5 +40,5 @@
 {
 }
 
-}
-}
+} // namespace dash
+} // namespace unity

=== modified file 'plugins/unityshell/src/DashStyle.cpp'
--- plugins/unityshell/src/DashStyle.cpp	2012-03-06 20:34:48 +0000
+++ plugins/unityshell/src/DashStyle.cpp	2012-03-20 23:22:18 +0000
@@ -1533,16 +1533,16 @@
                 (double) (garnish) + 1.0,
                 (double) (garnish) + 1.0,
                 7.0,
+                w - (double) (2 * garnish) - 2.0,
+                h - (double) (2 * garnish) - 2.0);
+  else
+    RoundedRect(cr,
+                1.0,
+                (double) (garnish) + 0.5,
+                (double) (garnish) + 0.5,
+                7.0,
                 w - (double) (2 * garnish) - 1.0,
                 h - (double) (2 * garnish) - 1.0);
-  else
-    RoundedRect(cr,
-                1.0,
-                (double) (garnish),
-                (double) (garnish),
-                7.0,
-                w - (double) (2 * garnish),
-                h - (double) (2 * garnish));
 
 
   if (pimpl->button_label_fill_color_[state].alpha != 0.0)
@@ -1728,8 +1728,6 @@
   if (cairo_surface_get_type(cairo_get_target(cr)) != CAIRO_SURFACE_TYPE_IMAGE)
     return false;
 
-  unsigned int garnish = GetButtonGarnishSize();
-  
   double w = cairo_image_surface_get_width(cairo_get_target(cr));
   double h = cairo_image_surface_get_height(cairo_get_target(cr));
 
@@ -1739,12 +1737,12 @@
 
   RoundedRect(cr,
               1.0,
-              (double) (garnish),
-              (double) (garnish),
+              (double) 0.5,
+              (double) 0.5,
               7.0,
-              w - (double) (2 * garnish),
-              h - (double) (2 * garnish));
-  
+              w - 1.0,
+              h - 1.0);
+
   cairo_set_source_rgba(cr, color);
   cairo_fill_preserve(cr);
   cairo_stroke(cr);
@@ -2153,6 +2151,127 @@
   return pimpl->dash_shine_.texture();
 }
 
+int Style::GetVSeparatorSize() const
+{
+  return 1;
+}
+
+int Style::GetHSeparatorSize() const
+{
+  return 1;
+
+}
+
+int Style::GetFilterBarWidth() const
+{
+  return 300;
+}
+
+
+int Style::GetFilterBarLeftPadding() const
+{
+  return 5;
+}
+
+int Style::GetFilterBarRightPadding() const
+{
+  return 5;
+}
+
+int Style::GetDashViewTopPadding() const
+{
+  return 10;
+}
+
+int Style::GetSearchBarLeftPadding() const
+{
+  return 10;
+}
+
+int Style::GetSearchBarRightPadding() const
+{
+  return 10;
+}
+
+int Style::GetSearchBarHeight() const
+{
+  return 42;
+}
+
+int Style::GetFilterResultsHighlightRightPadding() const
+{
+  return 5;
+}
+
+int Style::GetFilterResultsHighlightLeftPadding() const
+{
+  return 5;
+}
+
+int Style::GetFilterBarTopPadding() const
+{
+  return 10;
+}
+
+int Style::GetFilterHighlightPadding() const
+{
+  return 2;
+}
+
+int Style::GetSpaceBetweenFilterWidgets() const
+{
+  return 12;
+}
+
+int Style::GetAllButtonHeight() const
+{
+  return 30;
+}
+
+int Style::GetFilterButtonHeight() const
+{
+  return 30;
+}
+
+int Style::GetSpaceBetweenLensAndFilters() const
+{
+  return 9;
+}
+
+int Style::GetFilterViewRightPadding() const
+{
+  return 10;
+}
+
+int Style::GetScrollbarWidth() const
+{
+  return 3;
+}
+
+int Style::GetCategoryHighlightHeight() const
+{
+  return 24;
+}
+
+int Style::GetPlacesGroupTopSpace() const
+{
+  return 15;
+}
+
+int Style::GetCategoryHeaderLeftPadding() const
+{
+  return 20;
+}
+
+int Style::GetCategorySeparatorLeftPadding() const
+{
+  return 15;
+}
+
+int Style::GetCategorySeparatorRightPadding() const
+{
+  return 15;
+}
 
 namespace
 {

=== modified file 'plugins/unityshell/src/DashStyle.h'
--- plugins/unityshell/src/DashStyle.h	2012-03-20 10:27:41 +0000
+++ plugins/unityshell/src/DashStyle.h	2012-03-20 23:22:18 +0000
@@ -189,6 +189,47 @@
   nux::BaseTexture* GetStarSelectedIcon();
   nux::BaseTexture* GetStarHighlightIcon();
 
+  // Returns the width of the separator between the dash and the launcher.
+  int GetVSeparatorSize() const;
+
+  // Returns the height of the separator between the dash and the top panel.
+  int GetHSeparatorSize() const;
+
+  // Practically it is the space between the top border of the dash and the searchbar.
+  int GetDashViewTopPadding() const;
+
+  // Search bar
+  int GetSearchBarLeftPadding() const;
+  int GetSearchBarRightPadding() const;
+  int GetSearchBarHeight() const;
+  int GetFilterResultsHighlightRightPadding() const;
+  int GetFilterResultsHighlightLeftPadding() const;
+
+  // Filter bar
+  int GetFilterBarTopPadding() const;
+  int GetFilterHighlightPadding() const;
+  int GetSpaceBetweenFilterWidgets() const;
+  int GetAllButtonHeight() const;
+  int GetFilterBarLeftPadding() const;
+  int GetFilterBarRightPadding() const;
+  int GetFilterBarWidth() const;
+  int GetFilterButtonHeight() const;
+  int GetFilterViewRightPadding() const;
+
+  int GetSpaceBetweenLensAndFilters() const;
+
+  // Scrollbars
+  int GetScrollbarWidth() const;
+
+  // Places Group
+  int GetCategoryHighlightHeight() const;
+  int GetPlacesGroupTopSpace() const;
+  int GetCategoryHeaderLeftPadding() const;
+  int GetCategorySeparatorLeftPadding() const;
+  int GetCategorySeparatorRightPadding() const;
+
+  const static int SEARCH_BAR_EXTRA_PADDING = 1;
+
   sigc::signal<void> changed;
 
 private:

=== modified file 'plugins/unityshell/src/DashView.cpp'
--- plugins/unityshell/src/DashView.cpp	2012-03-15 12:39:16 +0000
+++ plugins/unityshell/src/DashView.cpp	2012-03-20 23:22:18 +0000
@@ -86,10 +86,10 @@
   , visible_(false)
 {
   renderer_.SetOwner(this);
-  renderer_.need_redraw.connect([this] () { 
+  renderer_.need_redraw.connect([this] () {
     QueueDraw();
   });
-  
+
   SetupViews();
   SetupUBusConnections();
 
@@ -161,21 +161,30 @@
 
 void DashView::SetupViews()
 {
+  dash::Style& style = dash::Style::Instance();
+
   layout_ = new nux::VLayout();
+  layout_->SetLeftAndRightPadding(style.GetVSeparatorSize(), 0);
+  layout_->SetTopAndBottomPadding(style.GetHSeparatorSize(), 0);
   SetLayout(layout_);
 
   content_layout_ = new DashLayout(NUX_TRACKER_LOCATION);
-  content_layout_->SetHorizontalExternalMargin(0);
-  content_layout_->SetVerticalExternalMargin(0);
-
+  content_layout_->SetTopAndBottomPadding(style.GetDashViewTopPadding() - style.SEARCH_BAR_EXTRA_PADDING, 0);
   layout_->AddLayout(content_layout_, 1, nux::MINOR_POSITION_LEFT, nux::MINOR_SIZE_FULL);
+
+  search_bar_layout_ = new nux::HLayout();
+  search_bar_layout_->SetLeftAndRightPadding(style.GetSearchBarLeftPadding() - style.SEARCH_BAR_EXTRA_PADDING, style.GetSearchBarLeftPadding() - style.GetFilterResultsHighlightRightPadding() - style.SEARCH_BAR_EXTRA_PADDING);
+  content_layout_->AddLayout(search_bar_layout_, 0, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_FULL);
+
   search_bar_ = new SearchBar();
   AddChild(search_bar_);
+  search_bar_->SetMinimumHeight(style.GetSearchBarHeight() + style.SEARCH_BAR_EXTRA_PADDING * 2);
+  search_bar_->SetMaximumHeight(style.GetSearchBarHeight() + style.SEARCH_BAR_EXTRA_PADDING * 2);
   search_bar_->activated.connect(sigc::mem_fun(this, &DashView::OnEntryActivated));
   search_bar_->search_changed.connect(sigc::mem_fun(this, &DashView::OnSearchChanged));
   search_bar_->live_search_reached.connect(sigc::mem_fun(this, &DashView::OnLiveSearchReached));
   search_bar_->showing_filters.changed.connect([&] (bool showing) { if (active_lens_view_) active_lens_view_->filters_expanded = showing; QueueDraw(); });
-  content_layout_->AddView(search_bar_, 0, nux::MINOR_POSITION_LEFT);
+  search_bar_layout_->AddView(search_bar_, 1, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_FULL);
   content_layout_->SetSpecialArea(search_bar_->show_filters());
 
   lenses_layout_ = new nux::VLayout();
@@ -207,7 +216,7 @@
 
 void DashView::Relayout()
 {
-  nux::Geometry geo = GetGeometry();
+  nux::Geometry const& geo = GetGeometry();
   content_geo_ = GetBestFitGeometry(geo);
 
   if (Settings::Instance().GetFormFactor() == FormFactor::NETBOOK)
@@ -216,16 +225,16 @@
       content_geo_ = geo;
   }
 
+  dash::Style& style = dash::Style::Instance();
+
   // kinda hacky, but it makes sure the content isn't so big that it throws
   // the bottom of the dash off the screen
   // not hugely happy with this, so FIXME
-  lenses_layout_->SetMaximumHeight (content_geo_.height - search_bar_->GetGeometry().height - lens_bar_->GetGeometry().height);
-  lenses_layout_->SetMinimumHeight (content_geo_.height - search_bar_->GetGeometry().height - lens_bar_->GetGeometry().height);
+  lenses_layout_->SetMaximumHeight (content_geo_.height - search_bar_->GetGeometry().height - lens_bar_->GetGeometry().height - style.GetDashViewTopPadding());
+  lenses_layout_->SetMinimumHeight (content_geo_.height - search_bar_->GetGeometry().height - lens_bar_->GetGeometry().height - style.GetDashViewTopPadding());
 
   layout_->SetMinMaxSize(content_geo_.width, content_geo_.height);
 
-  dash::Style& style = dash::Style::Instance();
-
   // Minus the padding that gets added to the left
   float tile_width = style.GetTileWidth();
   style.SetDefaultNColumns(floorf((content_geo_.width - 32) / tile_width));
@@ -257,9 +266,8 @@
 
   height = search_bar_->GetGeometry().height;
   height += tile_height * 3;
-  height += (24 + 15) * 3; // adding three group headers
-  height += lens_bar_->GetGeometry().height;
-  height += 6; // account for padding in PlacesGroup
+  height += 46 * 3; // adding three group headers
+  //height += lens_bar_->GetGeometry().height;
 
   if (for_geo.width > 800 && for_geo.height > 550)
   {
@@ -267,7 +275,7 @@
     height = MIN(height, for_geo.height-24);
   }
 
-  return nux::Geometry(0, 0, width-10, height);
+  return nux::Geometry(0, 0, width, height);
 }
 
 void DashView::Draw(nux::GraphicsEngine& gfx_context, bool force_draw)
@@ -278,7 +286,7 @@
 void DashView::DrawContent(nux::GraphicsEngine& gfx_context, bool force_draw)
 {
   renderer_.DrawInner(gfx_context, content_geo_, GetAbsoluteGeometry(), GetGeometry());
-  
+
   if (IsFullRedraw())
   {
     nux::GetPainter().PushBackgroundStack();
@@ -289,7 +297,7 @@
   {
     layout_->ProcessDraw(gfx_context, force_draw);
   }
-  
+
   renderer_.DrawInnerCleanup(gfx_context, content_geo_, GetAbsoluteGeometry(), GetGeometry());
 }
 
@@ -403,8 +411,8 @@
 
     // 250ms for the Search method call, rest for the actual search
     searching_timeout_id_ = g_timeout_add (500, &DashView::ResetSearchStateCb, this);
-    
-    
+
+
     if (hide_message_delay_id_)
     {
       g_source_remove(hide_message_delay_id_);
@@ -451,6 +459,7 @@
   }
 
   LensView* view = active_lens_view_ = lens_views_[id];
+  view->JumpToTop();
 
   for (auto it: lens_views_)
   {
@@ -494,8 +503,8 @@
   }
 
   active_lens_view_->CheckNoResults(hints);
+  std::string const& search_string = search_bar_->search_string;
 
-  std::string search_string = search_bar_->search_string;
   if (active_lens_view_ && active_lens_view_->search_string == search_string)
   {
     search_bar_->SearchFinished();
@@ -690,14 +699,14 @@
   {
     auto show_filters = search_bar_->show_filters();
     auto fscroll_view = active_lens_view_->fscroll_view();
-    
+
     if (show_filters && show_filters->HasKeyFocus())
     {
       if (fscroll_view->IsVisible() && fscroll_view)
         return fscroll_view->KeyNavIteration(direction);
       else
         return active_lens_view_->KeyNavIteration(direction);
-    } 
+    }
   }
   return this;
 }
@@ -745,7 +754,7 @@
     direction = KEY_NAV_ENTER;
     break;
   case NUX_VK_F4:
-    // Maybe we should not do it here, but it needs to be checked where 
+    // Maybe we should not do it here, but it needs to be checked where
     // we are able to know if alt is pressed.
     if (special_keys_state & NUX_STATE_ALT)
     {
@@ -757,7 +766,7 @@
     break;
   }
 
-  // We should not do it here, but I really don't want to make DashView 
+  // We should not do it here, but I really don't want to make DashView
   // focusable and I'm not able to know if ctrl is pressed in
   // DashView::KeyNavIteration.
    nux::InputArea* focus_area = nux::GetWindowCompositor().GetKeyFocusArea();
@@ -801,10 +810,10 @@
         for (auto tab = rbegin; tab != rend; ++tab)
         {
           const auto& tab_ptr = *tab;
-           
+
           if (use_the_prev)
             return tab_ptr;
-          
+
           if (focus_area)
             use_the_prev = focus_area->IsChildOf(tab_ptr);
         }
@@ -826,7 +835,7 @@
         {
           if (use_the_next)
             return tab;
-          
+
           if (focus_area)
             use_the_next = focus_area->IsChildOf(tab);
         }

=== modified file 'plugins/unityshell/src/DashView.h'
--- plugins/unityshell/src/DashView.h	2012-03-01 08:46:06 +0000
+++ plugins/unityshell/src/DashView.h	2012-03-20 23:22:18 +0000
@@ -120,6 +120,7 @@
   // View related
   nux::VLayout* layout_;
   DashLayout* content_layout_;
+  nux::HLayout* search_bar_layout_;
   SearchBar* search_bar_;
   nux::VLayout* lenses_layout_;
   LensBar* lens_bar_;

=== modified file 'plugins/unityshell/src/FilterBar.cpp'
--- plugins/unityshell/src/FilterBar.cpp	2012-02-23 21:20:16 +0000
+++ plugins/unityshell/src/FilterBar.cpp	2012-03-20 23:22:18 +0000
@@ -23,6 +23,7 @@
 #include <Nux/VLayout.h>
 #include <NuxCore/Logger.h>
 
+#include "DashStyle.h"
 #include "FilterBar.h"
 #include "FilterExpanderLabel.h"
 #include "FilterFactory.h"
@@ -36,9 +37,6 @@
 
 nux::logging::Logger logger("unity.dash.filterbar");
 
-const int SEPARATOR_LEFT_PADDING = 5;
-const int SEPARATOR_WIDTH_SOTTRACTOR = 9;
-
 }
 
 NUX_IMPLEMENT_OBJECT_TYPE(FilterBar);
@@ -59,8 +57,11 @@
 
 void FilterBar::Init()
 {
+  dash::Style& style = dash::Style::Instance();
+
   nux::LinearLayout* layout = new nux::VLayout(NUX_TRACKER_LOCATION);
-  layout->SetSpaceBetweenChildren(10);
+  layout->SetTopAndBottomPadding(style.GetFilterBarTopPadding() - style.GetFilterHighlightPadding() - style.SEARCH_BAR_EXTRA_PADDING);
+  layout->SetSpaceBetweenChildren(style.GetSpaceBetweenFilterWidgets() - style.GetFilterHighlightPadding());
   SetLayout(layout);
 }
 
@@ -81,6 +82,8 @@
   AddChild(filter_view);
   filter_map_[filter] = filter_view;
   GetLayout()->AddView(filter_view, 0, nux::MINOR_POSITION_LEFT, nux::MINOR_SIZE_FULL);
+
+  UpdateDrawSeparators();
 }
 
 void FilterBar::RemoveFilter(Filter::Ptr const& filter)
@@ -96,6 +99,8 @@
       break;
     }
   }
+
+  UpdateDrawSeparators();
 }
 
 void FilterBar::Draw(nux::GraphicsEngine& GfxContext, bool force_draw)
@@ -112,36 +117,31 @@
   GfxContext.PushClippingRectangle(GetGeometry());
   GetLayout()->ProcessDraw(GfxContext, force_draw);
 
-  nux::Color col(0.13f, 0.13f, 0.13f, 0.13f);
-
-  std::list<Area *>& layout_list = GetLayout()->GetChildren();
-  int i = 0;
-  int num_separators = layout_list.size() - 1;
-
-  for (auto iter : layout_list)
+  GfxContext.PopClippingRectangle();
+}
+
+void FilterBar::UpdateDrawSeparators()
+{
+  std::list<Area*> children = GetLayout()->GetChildren();
+  std::list<Area*>::reverse_iterator rit;
+  bool found_one = false;
+
+  for (rit = children.rbegin(); rit != children.rend(); ++rit)
   {
-    if (i != num_separators)
-    {
-      nux::Area* filter_view = iter;
-      nux::Geometry const& geom = filter_view->GetGeometry();
-
-      unsigned int alpha = 0, src = 0, dest = 0;
-      GfxContext.GetRenderStates().GetBlend(alpha, src, dest);
-
-      GfxContext.GetRenderStates().SetBlend(true, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
-      GfxContext.GetRenderStates().SetColorMask(true, true, true, false);
-      nux::GetPainter().Draw2DLine(GfxContext,
-                                   geom.x + SEPARATOR_LEFT_PADDING, geom.y + geom.height - 1,
-                                   geom.x + geom.width - SEPARATOR_WIDTH_SOTTRACTOR, geom.y + geom.height - 1,
-                                   col);
-      GfxContext.GetRenderStates().SetBlend(alpha, src, dest);
-    }
-    ++i;
+    FilterExpanderLabel* widget = dynamic_cast<FilterExpanderLabel*>(*rit);
+
+    if (!widget)
+      continue;
+
+    widget->draw_separator = found_one;
+    found_one = true;
   }
-
-  GfxContext.PopClippingRectangle();
 }
 
+//
+// Key navigation
+//
+
 bool FilterBar::AcceptKeyNavFocus()
 {
   return false;

=== modified file 'plugins/unityshell/src/FilterBar.h'
--- plugins/unityshell/src/FilterBar.h	2012-02-21 00:11:20 +0000
+++ plugins/unityshell/src/FilterBar.h	2012-03-20 23:22:18 +0000
@@ -60,6 +60,7 @@
 
 private:
   void Init();
+  void UpdateDrawSeparators();
 
   FilterFactory factory_;
   Filters::Ptr filters_;

=== modified file 'plugins/unityshell/src/FilterBasicButton.cpp'
--- plugins/unityshell/src/FilterBasicButton.cpp	2012-02-17 16:48:25 +0000
+++ plugins/unityshell/src/FilterBasicButton.cpp	2012-03-20 23:22:18 +0000
@@ -100,7 +100,7 @@
 
 void FilterBasicButton::RedrawTheme(nux::Geometry const& geom, cairo_t* cr, nux::ButtonVisualState faked_state)
 {
-  Style::Instance().Button(cr, faked_state, label_);
+  Style::Instance().Button(cr, faked_state, label_, -1, Alignment::CENTER, true);
 }
 
 void FilterBasicButton::RedrawFocusOverlay(nux::Geometry const& geom, cairo_t* cr)
@@ -111,7 +111,7 @@
 long FilterBasicButton::ComputeContentSize()
 {
   long ret = nux::Button::ComputeContentSize();
-  
+
   nux::Geometry const& geo = GetGeometry();
 
   if (cached_geometry_ != geo)

=== modified file 'plugins/unityshell/src/FilterExpanderLabel.cpp'
--- plugins/unityshell/src/FilterExpanderLabel.cpp	2012-03-05 20:06:16 +0000
+++ plugins/unityshell/src/FilterExpanderLabel.cpp	2012-03-20 23:22:18 +0000
@@ -22,31 +22,16 @@
 
 #include "DashStyle.h"
 #include "FilterExpanderLabel.h"
+#include "LineSeparator.h"
 
 namespace
 {
 
 const float EXPAND_DEFAULT_ICON_OPACITY = 1.0f;
 
-// right_hand_contents_
-const int RIGHT_HAND_CONTENTS_HEIGHT = 33;
-
-// layout_
-const int LAYOUT_LEFT_PADDING = 3;
-const int LAYOUT_RIGHT_PADDING = 1;
-
-// top_bar_layout_
-const int TOP_BAR_LAYOUT_LEFT_PADDING = 2;
-const int TOP_BAR_LAYOUT_RIGHT_PADDING = 0;
-const int TOP_BAR_LAYOUT_WIDTH_ADDER = 19;
-
 // expander_layout_
 const int EXPANDER_LAYOUT_SPACE_BETWEEN_CHILDREN = 8;
 
-// highlight
-const int HIGHLIGHT_HEIGHT = 34;
-const int HIGHLIGHT_WIDTH_SUBTRACTOR = 5;
-
 // font
 const char* const FONT_EXPANDER_LABEL = "Ubuntu Bold 13"; // 17px = 13
 
@@ -98,6 +83,7 @@
 FilterExpanderLabel::FilterExpanderLabel(std::string const& label, NUX_FILE_LINE_DECL)
   : nux::View(NUX_FILE_LINE_PARAM)
   , expanded(true)
+  , draw_separator(false)
   , layout_(nullptr)
   , top_bar_layout_(nullptr)
   , expander_view_(nullptr)
@@ -106,15 +92,44 @@
   , cairo_label_(nullptr)
   , raw_label_(label)
   , label_("label")
+  , separator_(nullptr)
 {
   expanded.changed.connect(sigc::mem_fun(this, &FilterExpanderLabel::DoExpandChange));
   BuildLayout();
-
   SetAcceptKeyNavFocusOnMouseDown(false);
+
+  separator_ = new HSeparator;
+  separator_->SinkReference();
+
+  dash::Style& style = dash::Style::Instance();
+  int space_height = style.GetSpaceBetweenFilterWidgets() - style.GetFilterHighlightPadding();
+
+  space_ = new nux::SpaceLayout(space_height, space_height, space_height, space_height);
+  space_->SinkReference();
+
+  draw_separator.changed.connect([&](bool value)
+  {
+    if (value and !separator_->IsChildOf(layout_))
+    {
+      layout_->AddLayout(space_, 0);
+      layout_->AddView(separator_, 0);
+    }
+    else if (!value and separator_->IsChildOf(layout_))
+    {
+      layout_->AddLayout(space_, 0);
+      layout_->RemoveChildObject(separator_);
+    }
+    QueueDraw();
+  });
 }
 
 FilterExpanderLabel::~FilterExpanderLabel()
 {
+  if (space_)
+    space_->UnReference();
+
+  if (separator_)
+    separator_->UnReference();
 }
 
 void FilterExpanderLabel::SetLabel(std::string const& label)
@@ -126,11 +141,12 @@
 
 void FilterExpanderLabel::SetRightHandView(nux::View* view)
 {
-  view->SetMinimumHeight(RIGHT_HAND_CONTENTS_HEIGHT);
-  view->SetMaximumHeight(RIGHT_HAND_CONTENTS_HEIGHT);
+  dash::Style& style = dash::Style::Instance();
 
   right_hand_contents_ = view;
-  top_bar_layout_->AddView(right_hand_contents_, 0, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_FULL);
+  right_hand_contents_->SetMinimumHeight(style.GetAllButtonHeight());
+  right_hand_contents_->SetMaximumHeight(style.GetAllButtonHeight());
+  top_bar_layout_->AddView(right_hand_contents_, 0, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_FIX);
 }
 
 void FilterExpanderLabel::SetContents(nux::Layout* contents)
@@ -139,18 +155,19 @@
   contents_ = contents;
 
   layout_->AddLayout(contents_.GetPointer(), 1, nux::MINOR_POSITION_LEFT, nux::MINOR_SIZE_FULL);
-  top_bar_layout_->SetTopAndBottomPadding(0);
 
   QueueDraw();
 }
 
 void FilterExpanderLabel::BuildLayout()
 {
+  dash::Style& style = dash::Style::Instance();
+
   layout_ = new nux::VLayout(NUX_TRACKER_LOCATION);
-  layout_->SetLeftAndRightPadding(LAYOUT_LEFT_PADDING, LAYOUT_RIGHT_PADDING);
+  layout_->SetLeftAndRightPadding(style.GetFilterBarLeftPadding(), style.GetFilterBarRightPadding());
 
   top_bar_layout_ = new nux::HLayout(NUX_TRACKER_LOCATION);
-  top_bar_layout_->SetLeftAndRightPadding(TOP_BAR_LAYOUT_LEFT_PADDING, TOP_BAR_LAYOUT_RIGHT_PADDING);
+  top_bar_layout_->SetTopAndBottomPadding(style.GetFilterHighlightPadding());
 
   expander_layout_ = new nux::HLayout(NUX_TRACKER_LOCATION);
   expander_layout_->SetSpaceBetweenChildren(EXPANDER_LAYOUT_SPACE_BETWEEN_CHILDREN);
@@ -183,8 +200,6 @@
   expander_layout_->AddView(arrow_layout_, 0, nux::MINOR_POSITION_CENTER);
   top_bar_layout_->AddSpace(1, 1);
 
-  top_bar_layout_->SetMaximumWidth((Style::Instance().GetTileWidth() - 12) * 2 + TOP_BAR_LAYOUT_WIDTH_ADDER);
-
   layout_->AddLayout(top_bar_layout_, 0, nux::MINOR_POSITION_LEFT);
   layout_->SetVerticalInternalMargin(0);
 
@@ -232,13 +247,11 @@
 
   if (change and contents_ and !contents_->IsChildOf(layout_))
   {
-    layout_->AddLayout(contents_.GetPointer(), 1, nux::MINOR_POSITION_LEFT, nux::MINOR_SIZE_FULL);
-    top_bar_layout_->SetTopAndBottomPadding(0);
+    layout_->AddLayout(contents_.GetPointer(), 1, nux::MINOR_POSITION_LEFT, nux::MINOR_SIZE_FULL, 100.0f, nux::LayoutPosition(1));
   }
   else if (!change and contents_ and contents_->IsChildOf(layout_))
   {
     layout_->RemoveChildObject(contents_.GetPointer());
-    top_bar_layout_->SetTopAndBottomPadding(0, 10);
   }
 
   layout_->ComputeContentSize();
@@ -261,8 +274,7 @@
   {
     nux::Geometry geo(top_bar_layout_->GetGeometry());
     geo.x = base.x;
-    geo.height = HIGHLIGHT_HEIGHT;
-    geo.width = base.width - HIGHLIGHT_WIDTH_SUBTRACTOR;;
+    geo.width = base.width;
 
     if (!highlight_layer_)
       highlight_layer_.reset(dash::Style::Instance().FocusOverlay(geo.width, geo.height));

=== modified file 'plugins/unityshell/src/FilterExpanderLabel.h'
--- plugins/unityshell/src/FilterExpanderLabel.h	2012-03-01 15:52:33 +0000
+++ plugins/unityshell/src/FilterExpanderLabel.h	2012-03-20 23:22:18 +0000
@@ -43,6 +43,9 @@
 
 namespace unity
 {
+
+class HSeparator;
+
 namespace dash
 {
 
@@ -61,6 +64,7 @@
   virtual std::string GetFilterType() = 0;
 
   nux::Property<bool> expanded;
+  nux::Property<bool> draw_separator;
 
 protected:
   virtual bool AcceptKeyNavFocus();
@@ -88,6 +92,8 @@
   nux::SpaceLayout* arrow_top_space_;
   nux::SpaceLayout* arrow_bottom_space_;
   IconTexture* expand_icon_;
+  HSeparator* separator_;
+  nux::SpaceLayout* space_;
 
   nux::ObjectPtr<nux::Layout> contents_;
   std::unique_ptr<nux::AbstractPaintLayer> highlight_layer_;

=== modified file 'plugins/unityshell/src/FilterGenreWidget.cpp'
--- plugins/unityshell/src/FilterGenreWidget.cpp	2012-02-09 20:19:30 +0000
+++ plugins/unityshell/src/FilterGenreWidget.cpp	2012-03-20 23:22:18 +0000
@@ -39,6 +39,8 @@
 FilterGenre::FilterGenre(int columns, NUX_FILE_LINE_DECL)
  : FilterExpanderLabel(_("Categories"), NUX_FILE_LINE_PARAM)
 {
+  dash::Style& style = dash::Style::Instance();
+
   InitTheme();
 
   all_button_ = new FilterAllButton(NUX_TRACKER_LOCATION);
@@ -46,16 +48,18 @@
   genre_layout_ = new nux::GridHLayout(NUX_TRACKER_LOCATION);
   genre_layout_->ForceChildrenSize(true);
   genre_layout_->MatchContentSize(true);
-  genre_layout_->SetSpaceBetweenChildren (9, 9);
-  genre_layout_->SetTopAndBottomPadding(9, 12);
+  genre_layout_->SetTopAndBottomPadding(style.GetSpaceBetweenFilterWidgets() - style.GetFilterHighlightPadding(), style.GetFilterHighlightPadding());
   genre_layout_->EnablePartialVisibility(false);
+
   if (columns == 3)
   {
-    genre_layout_->SetChildrenSize(92, 33);
+    genre_layout_->SetChildrenSize((style.GetFilterBarWidth() - 12 * 2) / 3, style.GetFilterButtonHeight());
+    genre_layout_->SetSpaceBetweenChildren (12, 12);
   }
   else
   {
-    genre_layout_->SetChildrenSize(Style::Instance().GetTileWidth() - 7, 33);
+    genre_layout_->SetChildrenSize((style.GetFilterBarWidth() - 10 ) / 2, style.GetFilterButtonHeight());
+    genre_layout_->SetSpaceBetweenChildren (10, 12);
   }
 
   SetRightHandView(all_button_);
@@ -72,7 +76,7 @@
 
   all_button_->SetFilter(filter_);
   expanded = !filter_->collapsed();
-  
+
   filter_->option_added.connect(sigc::mem_fun(this, &FilterGenre::OnOptionAdded));
   filter_->option_removed.connect(sigc::mem_fun(this, &FilterGenre::OnOptionRemoved));
 

=== modified file 'plugins/unityshell/src/FilterMultiRangeButton.cpp'
--- plugins/unityshell/src/FilterMultiRangeButton.cpp	2012-03-01 15:52:33 +0000
+++ plugins/unityshell/src/FilterMultiRangeButton.cpp	2012-03-20 23:22:18 +0000
@@ -148,7 +148,7 @@
     }
   }
 
-  SetMinimumHeight(32);
+  SetMinimumHeight(dash::Style::Instance().GetFilterButtonHeight() + 3);
 }
 
 void FilterMultiRangeButton::RedrawTheme(nux::Geometry const& geom,
@@ -190,7 +190,7 @@
                                                 cairo_t* cr,
                                                 MultiRangeArrow faked_arrow,
                                                 MultiRangeSide faked_side)
-{  
+{
   Arrow arrow;
   if (faked_arrow == MultiRangeArrow::NONE)
     arrow = Arrow::NONE;

=== modified file 'plugins/unityshell/src/FilterMultiRangeWidget.cpp'
--- plugins/unityshell/src/FilterMultiRangeWidget.cpp	2012-02-13 02:15:31 +0000
+++ plugins/unityshell/src/FilterMultiRangeWidget.cpp	2012-03-20 23:22:18 +0000
@@ -22,6 +22,7 @@
 
 #include <Nux/Nux.h>
 
+#include "DashStyle.h"
 #include "FilterMultiRangeWidget.h"
 #include "FilterMultiRangeButton.h"
 #include "FilterBasicButton.h"
@@ -33,15 +34,6 @@
 {
 namespace dash
 {
-namespace
-{
-
-const int TOP_PADDING = 9;
-const int RIGHT_PADDING = 8;
-const int BOTTOM_PADDING = 12;
-const int LEFT_PADDING = 0;
-
-}
 
 NUX_IMPLEMENT_OBJECT_TYPE(FilterMultiRange);
 
@@ -50,11 +42,17 @@
 {
   InitTheme();
 
+  dash::Style& style = dash::Style::Instance();
+  const int left_padding = 0;
+  const int right_padding = 0;
+  const int top_padding = style.GetSpaceBetweenFilterWidgets() - style.GetFilterHighlightPadding() - 2;
+  const int bottom_padding = style.GetFilterHighlightPadding() - 1;
+
   all_button_ = new FilterAllButton(NUX_TRACKER_LOCATION);
 
   layout_ = new nux::HLayout(NUX_TRACKER_LOCATION);
-  layout_->SetLeftAndRightPadding(LEFT_PADDING, RIGHT_PADDING);
-  layout_->SetTopAndBottomPadding(TOP_PADDING, BOTTOM_PADDING);
+  layout_->SetLeftAndRightPadding(left_padding, right_padding);
+  layout_->SetTopAndBottomPadding(top_padding, bottom_padding);
 
   SetRightHandView(all_button_);
   SetContents(layout_);

=== modified file 'plugins/unityshell/src/FilterRatingsWidget.cpp'
--- plugins/unityshell/src/FilterRatingsWidget.cpp	2012-02-20 11:59:12 +0000
+++ plugins/unityshell/src/FilterRatingsWidget.cpp	2012-03-20 23:22:18 +0000
@@ -24,6 +24,7 @@
 #include <glib.h>
 #include <glib/gi18n-lib.h>
 
+#include "DashStyle.h"
 #include "FilterGenreWidget.h"
 #include "FilterGenreButton.h"
 #include "FilterBasicButton.h"
@@ -32,8 +33,6 @@
 
 namespace
 {
-const int top_padding    = 11;
-const int bottom_padding = 12;
 const int star_size      = 28;
 }
 
@@ -49,6 +48,10 @@
 {
   all_button_ = new FilterAllButton(NUX_TRACKER_LOCATION);
 
+  dash::Style& style = dash::Style::Instance();
+  const int top_padding    = style.GetSpaceBetweenFilterWidgets() - style.GetFilterHighlightPadding() - 1; // -1 (PNGs have an 1px top padding)
+  const int bottom_padding = style.GetFilterHighlightPadding();
+
   nux::VLayout* layout = new nux::VLayout(NUX_TRACKER_LOCATION);
   layout->SetTopAndBottomPadding(top_padding, bottom_padding);
   ratings_ = new FilterRatingsButton(NUX_TRACKER_LOCATION);

=== modified file 'plugins/unityshell/src/HudView.cpp'
--- plugins/unityshell/src/HudView.cpp	2012-03-20 15:15:18 +0000
+++ plugins/unityshell/src/HudView.cpp	2012-03-20 23:22:18 +0000
@@ -321,6 +321,8 @@
 
 void View::SetupViews()
 {
+  dash::Style& style = dash::Style::Instance();
+
   nux::VLayout* super_layout = new nux::VLayout(); 
   layout_ = new nux::HLayout();
   { 
@@ -348,6 +350,8 @@
       // add the search bar to the composite
       search_bar_ = new unity::SearchBar(content_width, true);
       search_bar_->disable_glow = true;
+      search_bar_->SetMinimumHeight(style.GetSearchBarHeight() + style.SEARCH_BAR_EXTRA_PADDING * 2);
+      search_bar_->SetMaximumHeight(style.GetSearchBarHeight() + style.SEARCH_BAR_EXTRA_PADDING * 2);
       search_bar_->search_hint = default_text;
       search_bar_->search_changed.connect(sigc::mem_fun(this, &View::OnSearchChanged));
       AddChild(search_bar_.GetPointer());

=== modified file 'plugins/unityshell/src/LensView.cpp'
--- plugins/unityshell/src/LensView.cpp	2012-03-15 12:39:16 +0000
+++ plugins/unityshell/src/LensView.cpp	2012-03-20 23:22:18 +0000
@@ -37,12 +37,9 @@
 {
 namespace dash
 {
-
 namespace
 {
 nux::logging::Logger logger("unity.dash.lensview");
-
-const int FSCROLL_VIEW_WIDTH_ADDER = 11;
 }
 
 // This is so we can access some protected members in scrollview.
@@ -84,7 +81,7 @@
       ScrollDown (1, size);
     }
   }
-  
+
   void SetRightArea(nux::Area* area)
   {
     right_area_ = area;
@@ -94,7 +91,7 @@
   {
     up_area_ = area;
   }
-  
+
 protected:
 
   // This is so we can break the natural key navigation path.
@@ -163,7 +160,7 @@
         auto expand_label = category->GetHeaderFocusableView();
         auto child = category->GetChildView();
 
-        if ((child && child->HasKeyFocus()) || 
+        if ((child && child->HasKeyFocus()) ||
             (expand_label && expand_label->HasKeyFocus()))
         {
 
@@ -187,8 +184,11 @@
 
 void LensView::SetupViews(nux::Area* show_filters)
 {
+  dash::Style& style = dash::Style::Instance();
+
   layout_ = new nux::HLayout(NUX_TRACKER_LOCATION);
-  layout_->SetHorizontalInternalMargin(10);
+  layout_->SetSpaceBetweenChildren(style.GetSpaceBetweenLensAndFilters());
+
   scroll_view_ = new LensScrollView(new PlacesVScrollBar(NUX_TRACKER_LOCATION),
                                     NUX_TRACKER_LOCATION);
   scroll_view_->EnableVerticalScrollBar(true);
@@ -203,8 +203,7 @@
   no_results_->SetTextColor(nux::color::White);
   scroll_layout_->AddView(no_results_, 1, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_MATCHCONTENT);
 
-  fscroll_view_ = new LensScrollView(new PlacesVScrollBar(NUX_TRACKER_LOCATION),
-                                     NUX_TRACKER_LOCATION);
+  fscroll_view_ = new LensScrollView(new PlacesVScrollBar(NUX_TRACKER_LOCATION), NUX_TRACKER_LOCATION);
   fscroll_view_->EnableVerticalScrollBar(true);
   fscroll_view_->EnableHorizontalScrollBar(false);
   fscroll_view_->SetVisible(false);
@@ -215,8 +214,16 @@
   fscroll_view_->SetLayout(fscroll_layout_);
 
   filter_bar_ = new FilterBar();
+  int width = style.GetFilterBarWidth() +
+              style.GetFilterBarLeftPadding() +
+              style.GetFilterBarRightPadding();
+
+  fscroll_view_->SetMinimumWidth(width + style.GetFilterViewRightPadding());
+  fscroll_view_->SetMaximumWidth(width + style.GetFilterViewRightPadding());
+  filter_bar_->SetMinimumWidth(width);
+  filter_bar_->SetMaximumWidth(width);
   AddChild(filter_bar_);
-  fscroll_layout_->AddView(filter_bar_);
+  fscroll_layout_->AddView(filter_bar_, 0);
 
   SetLayout(layout_);
 }
@@ -393,14 +400,14 @@
 
     LOG_DEBUG(logger) << "The no-result-hint is: " << markup.str();
 
-    scroll_layout_->SetContentDistribution(nux::MAJOR_POSITION_CENTER); 
+    scroll_layout_->SetContentDistribution(nux::MAJOR_POSITION_CENTER);
 
     no_results_active_ = true;
     no_results_->SetText(markup.str());
   }
   else if (count && no_results_active_)
   {
-    scroll_layout_->SetContentDistribution(nux::MAJOR_POSITION_START);  
+    scroll_layout_->SetContentDistribution(nux::MAJOR_POSITION_START);
 
     no_results_active_ = false;
     no_results_->SetText("");
@@ -411,7 +418,7 @@
 {
   if (no_results_active_)
   {
-    scroll_layout_->SetContentDistribution(nux::MAJOR_POSITION_START);  
+    scroll_layout_->SetContentDistribution(nux::MAJOR_POSITION_START);
     no_results_active_ = false;
     no_results_->SetText("");
   }
@@ -437,13 +444,7 @@
 
 void LensView::OnFilterAdded(Filter::Ptr filter)
 {
-  std::string id = filter->id;
   filter_bar_->AddFilter(filter);
-
-  int width = dash::Style::Instance().GetTileWidth();
-  fscroll_view_->SetMinimumWidth(width * 2 + FSCROLL_VIEW_WIDTH_ADDER);
-  fscroll_view_->SetMaximumWidth(width * 2 + FSCROLL_VIEW_WIDTH_ADDER);
-
   can_refine_search = true;
 }
 
@@ -476,9 +477,7 @@
 void LensView::DrawContent(nux::GraphicsEngine& gfx_context, bool force_draw)
 {
   gfx_context.PushClippingRectangle(GetGeometry());
-
   layout_->ProcessDraw(gfx_context, force_draw);
-
   gfx_context.PopClippingRectangle();
 }
 
@@ -514,6 +513,11 @@
   return num_rows;
 }
 
+void LensView::JumpToTop()
+{
+  scroll_view_->ScrollToPosition(nux::Geometry(0, 0, 0, 0));
+}
+
 void LensView::ActivateFirst()
 {
   Results::Ptr results = lens_->results;

=== modified file 'plugins/unityshell/src/LensView.h'
--- plugins/unityshell/src/LensView.h	2012-03-01 08:46:06 +0000
+++ plugins/unityshell/src/LensView.h	2012-03-20 23:22:18 +0000
@@ -59,6 +59,7 @@
   nux::Area* fscroll_view() const;
 
   int GetNumRows();
+  void JumpToTop();
 
   virtual void ActivateFirst();
 

=== modified file 'plugins/unityshell/src/LineSeparator.cpp'
--- plugins/unityshell/src/LineSeparator.cpp	2011-12-13 22:53:29 +0000
+++ plugins/unityshell/src/LineSeparator.cpp	2012-03-20 23:22:18 +0000
@@ -23,7 +23,7 @@
 
 namespace unity
 {
-  
+
 HSeparator::HSeparator()
 {
   SetMinimumHeight(1);
@@ -43,31 +43,28 @@
 
 void HSeparator::Draw(nux::GraphicsEngine &GfxContext, bool force_draw)
 {
-  nux::Geometry base = GetGeometry();
-  base.OffsetPosition(3, 0);
-  base.OffsetSize(-6, 0);
+  nux::Geometry const& base = GetGeometry();
   int y0 = base.y + base.GetHeight() / 2;
 
-  nux::GetGraphicsDisplay()->GetGraphicsEngine()->GetRenderStates().SetBlend(TRUE, GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+  unsigned int alpha = 0, src = 0, dest = 0;
+  GfxContext.GetRenderStates().GetBlend(alpha, src, dest);
+  nux::GetGraphicsDisplay()->GetGraphicsEngine()->GetRenderStates().SetBlend(true, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
 
   if (base.GetWidth() - 2 * border_size_ > 0)
   {
-    nux::Color color0 = color_;
-    nux::Color color1 = color_;
-    color0.alpha = alpha0_;
-    color1.alpha = alpha1_;
+    nux::Color color0 = color_ * alpha0_;
+    nux::Color color1 = color_ * alpha1_;
     nux::GetPainter().Draw2DLine(GfxContext, base.x, y0, base.x + border_size_, y0, color0, color1);
     nux::GetPainter().Draw2DLine(GfxContext, base.x + border_size_, y0, base.x + base.GetWidth() - border_size_, y0, color1, color1);
     nux::GetPainter().Draw2DLine(GfxContext, base.x + base.GetWidth() - border_size_, y0, base.x + base.GetWidth(), y0, color1, color0);
   }
   else
   {
-    nux::Color color1 = color_;
-    color1.alpha = alpha1_;
+    nux::Color color1 = color_ *  alpha1_;
     nux::GetPainter().Draw2DLine(GfxContext, base.x, y0, base.x + base.GetWidth(), y0, color1, color1);
   }
 
-  nux::GetGraphicsDisplay()->GetGraphicsEngine()->GetRenderStates().SetBlend(FALSE);
+  GfxContext.GetRenderStates().SetBlend(alpha, src, dest);
 }
 
 } // namespace unity

=== modified file 'plugins/unityshell/src/LineSeparator.h'
--- plugins/unityshell/src/LineSeparator.h	2011-12-13 22:53:29 +0000
+++ plugins/unityshell/src/LineSeparator.h	2012-03-20 23:22:18 +0000
@@ -34,6 +34,7 @@
   ~HSeparator();
 
 protected:
+  virtual bool AcceptKeyNavFocus() { return false; }
   virtual void Draw(nux::GraphicsEngine& GfxContext, bool force_draw);
   virtual void DrawContent(nux::GraphicsEngine& GfxContext, bool force_draw) {};
 

=== modified file 'plugins/unityshell/src/OverlayRenderer.cpp'
--- plugins/unityshell/src/OverlayRenderer.cpp	2012-03-20 08:42:33 +0000
+++ plugins/unityshell/src/OverlayRenderer.cpp	2012-03-20 23:22:18 +0000
@@ -31,7 +31,7 @@
 #include "UBusMessages.h"
 #include "UBusWrapper.h"
 
-namespace unity 
+namespace unity
 {
 namespace
 {
@@ -46,29 +46,29 @@
 public:
   OverlayRendererImpl(OverlayRenderer *parent_);
   ~OverlayRendererImpl();
-  
+
   void Init();
   void OnBackgroundColorChanged(GVariant* args);
-  
+
   void Draw(nux::GraphicsEngine& gfx_context, nux::Geometry content_geo, nux::Geometry absolute_geo, nux::Geometry geometry, bool force_draw);
   void DrawContent(nux::GraphicsEngine& gfx_context, nux::Geometry content_geo, nux::Geometry absolute_geo, nux::Geometry geometry);
   void DrawContentCleanup(nux::GraphicsEngine& gfx_context, nux::Geometry content_geo, nux::Geometry absolute_geo, nux::Geometry geometry);
-  
+
   BackgroundEffectHelper bg_effect_helper_;
   nux::ColorLayer* bg_layer_;
   nux::ColorLayer* bg_darken_layer_;
   nux::Color bg_color_;
-  
+
   nux::Geometry content_geo;
   nux::ObjectPtr <nux::IOpenGLBaseTexture> bg_blur_texture_;
   nux::ObjectPtr <nux::IOpenGLBaseTexture> bg_shine_texture_;
-  
+
   // temporary variable that stores the number of backgrounds we have rendered
   int bgs;
   bool visible;
-  
+
   UBusManager ubus_manager_;
-  
+
   OverlayRenderer *parent;
 };
 
@@ -93,16 +93,16 @@
   rop.SrcBlend = GL_ONE;
   rop.DstBlend = GL_ONE_MINUS_SRC_ALPHA;
   bg_layer_ = new nux::ColorLayer(nux::Color(0.0f, 0.0f, 0.0f, 0.9), true, rop);
-  
+
   rop.Blend = true;
   rop.SrcBlend = GL_ZERO;
   rop.DstBlend = GL_SRC_COLOR;
   bg_darken_layer_ = new nux::ColorLayer(nux::Color(0.9f, 0.9f, 0.9f, 1.0f), false, rop);
   bg_shine_texture_ = unity::dash::Style::Instance().GetDashShine()->GetDeviceTexture();
-  
+
   ubus_manager_.RegisterInterest(UBUS_BACKGROUND_COLOR_CHANGED,
                                  sigc::mem_fun(this, &OverlayRendererImpl::OnBackgroundColorChanged));
-  
+
   ubus_manager_.SendMessage(UBUS_BACKGROUND_REQUEST_COLOUR_EMIT);
 }
 
@@ -114,14 +114,14 @@
   nux::Color color = nux::Color(red, green, blue, alpha);
   bg_layer_->SetColor(color);
   bg_color_ = color;
-  
+
   parent->need_redraw.emit();
 }
 
 void OverlayRendererImpl::Draw(nux::GraphicsEngine& gfx_context, nux::Geometry content_geo, nux::Geometry absolute_geo, nux::Geometry geometry, bool force_edges)
 {
   bool paint_blur = BackgroundEffectHelper::blur_type != BLUR_NONE;
-  nux::Geometry geo = content_geo;
+  nux::Geometry geo(content_geo);
 
   if (dash::Settings::Instance().GetFormFactor() != dash::FormFactor::NETBOOK || force_edges)
   {
@@ -242,25 +242,25 @@
       }
     }
   }
-  
-  
+
+
   nux::TexCoordXForm texxform_absolute_bg;
   texxform_absolute_bg.flip_v_coord = true;
   texxform_absolute_bg.SetTexCoordType(nux::TexCoordXForm::OFFSET_COORD);
   texxform_absolute_bg.uoffset = ((float) content_geo.x) / absolute_geo.width;
   texxform_absolute_bg.voffset = ((float) content_geo.y) / absolute_geo.height;
   texxform_absolute_bg.SetWrap(nux::TEXWRAP_CLAMP, nux::TEXWRAP_CLAMP);
-  
+
   if (paint_blur)
   {
     nux::Geometry blur_geo(absolute_geo.x, absolute_geo.y, content_geo.width, content_geo.height);
     bg_blur_texture_ = bg_effect_helper_.GetBlurRegion(blur_geo);
-    
+
     if (bg_blur_texture_.IsValid())
     {
       nux::Geometry bg_clip = geo;
       gfx_context.PushClippingRectangle(bg_clip);
-      
+
       gfx_context.GetRenderStates().SetBlend(false);
 #ifndef NUX_OPENGLES_20
       if (gfx_context.UsingGLSLCodePath())
@@ -281,22 +281,24 @@
 
 #endif
       gPainter.PopBackground();
-      
+
       gfx_context.PopClippingRectangle();
     }
   }
 
   // Draw the left and top lines
+  dash::Style& style = dash::Style::Instance();
+
   gfx_context.GetRenderStates().SetColorMask(true, true, true, true);
   gfx_context.GetRenderStates().SetBlend(true);
   gfx_context.GetRenderStates().SetPremultipliedBlend(nux::SRC_OVER);
 
-  const double line_opacity = 0.22;
+  const double line_opacity = 0.22f;
   nux::Color line_color = nux::color::White * line_opacity;
   nux::GetPainter().Paint2DQuadColor(gfx_context,
                                      nux::Geometry(geometry.x,
                                                    geometry.y,
-                                                   1,
+                                                   style.GetVSeparatorSize(),
                                                    content_geo.height + INNER_CORNER_RADIUS),
                                      nux::color::Transparent,
                                      line_color,
@@ -307,12 +309,12 @@
                                      nux::Geometry(geometry.x,
                                                    geometry.y,
                                                    content_geo.width + INNER_CORNER_RADIUS,
-                                                   1),
+                                                   style.GetHSeparatorSize()),
                                      nux::color::Transparent,
                                      nux::color::Transparent,
                                      line_color,
                                      line_color);
-  
+
   // Draw the background
   bg_darken_layer_->SetGeometry(content_geo);
   nux::GetPainter().RenderSinglePaintLayer(gfx_context, content_geo, bg_darken_layer_);
@@ -324,19 +326,19 @@
     nux::GetPainter().RenderSinglePaintLayer(gfx_context, content_geo, bg_layer_);
   }
 #endif
-  
-  
+
+
   texxform_absolute_bg.flip_v_coord = false;
   texxform_absolute_bg.uoffset = (1.0f / bg_shine_texture_->GetWidth()) * parent->x_offset;
   texxform_absolute_bg.voffset = (1.0f / bg_shine_texture_->GetHeight()) * parent->y_offset;
-  
+
   gfx_context.GetRenderStates().SetColorMask(true, true, true, false);
   gfx_context.GetRenderStates().SetBlend(true, GL_DST_COLOR, GL_ONE);
-  
+
   gfx_context.QRP_1Tex (content_geo.x, content_geo.y,
                         content_geo.width, content_geo.height,
                         bg_shine_texture_, texxform_absolute_bg, nux::color::White);
-  
+
   if (dash::Settings::Instance().GetFormFactor() != dash::FormFactor::NETBOOK)
   {
     // Make bottom-right corner rounded
@@ -363,7 +365,7 @@
     {
       nux::Geometry fill_geo (geo.x + geo.width, geo.y + i, INNER_CORNER_RADIUS - i, 1);
       nux::GetPainter().Paint2DQuadColor(gfx_context, fill_geo, bg_color_);
-      
+
       nux::Color dark = bg_color_ * 0.8f;
       dark.alpha = bg_color_.alpha;
       fill_geo = nux::Geometry(geo.x + i, geo.y + geo.height, 1, INNER_CORNER_RADIUS - i);
@@ -377,24 +379,24 @@
   bool paint_blur = BackgroundEffectHelper::blur_type != BLUR_NONE;
   nux::Geometry geo = geometry;
   bgs = 0;
-  
+
   gfx_context.PushClippingRectangle(geo);
-  
+
   gfx_context.GetRenderStates().SetBlend(true);
   gfx_context.GetRenderStates().SetPremultipliedBlend(nux::SRC_OVER);
-  
+
   nux::TexCoordXForm texxform_absolute_bg;
   texxform_absolute_bg.flip_v_coord = true;
   texxform_absolute_bg.SetTexCoordType(nux::TexCoordXForm::OFFSET_COORD);
   texxform_absolute_bg.uoffset = ((float) content_geo.x) / absolute_geo.width;
   texxform_absolute_bg.voffset = ((float) content_geo.y) / absolute_geo.height;
   texxform_absolute_bg.SetWrap(nux::TEXWRAP_CLAMP, nux::TEXWRAP_CLAMP);
-  
+
   nux::ROPConfig rop;
   rop.Blend = false;
   rop.SrcBlend = GL_ONE;
   rop.DstBlend = GL_ONE_MINUS_SRC_ALPHA;
-  
+
   if (bg_blur_texture_.IsValid() && paint_blur)
   {
 #ifndef NUX_OPENGLES_20
@@ -422,11 +424,11 @@
 #endif
     bgs++;
   }
-  
+
   // draw the darkening behind our paint
   nux::GetPainter().PushLayer(gfx_context, bg_darken_layer_->GetGeometry(), bg_darken_layer_);
   bgs++;
-  
+
 #ifndef NUX_OPENGLES_20
   if (gfx_context.UsingGLSLCodePath() == FALSE)
   {
@@ -434,7 +436,7 @@
     bgs++;
   }
 #endif
-  
+
   // apply the shine
   rop.Blend = true;
   rop.SrcBlend = GL_DST_COLOR;
@@ -442,7 +444,7 @@
   texxform_absolute_bg.flip_v_coord = false;
   texxform_absolute_bg.uoffset = (1.0f / bg_shine_texture_->GetWidth()) * parent->x_offset;
   texxform_absolute_bg.voffset = (1.0f / bg_shine_texture_->GetHeight()) * parent->y_offset;
-  
+
   nux::GetPainter().PushTextureLayer(gfx_context, content_geo,
                                      bg_shine_texture_,
                                      texxform_absolute_bg,
@@ -455,10 +457,10 @@
 void OverlayRendererImpl::DrawContentCleanup(nux::GraphicsEngine& gfx_context, nux::Geometry content_geo, nux::Geometry absolute_geo, nux::Geometry geometry)
 {
   nux::GetPainter().PopBackground(bgs);
-  
+
   gfx_context.GetRenderStates().SetBlend(false);
   gfx_context.PopClippingRectangle();
-  
+
   if (dash::Settings::Instance().GetFormFactor() != dash::FormFactor::NETBOOK)
   {
     // Make bottom-right corner rounded
@@ -474,16 +476,16 @@
                                           true,
                                           rop);
   }
-  
+
   bgs = 0;
 }
 
 
- 
+
 OverlayRenderer::OverlayRenderer()
   : pimpl_(new OverlayRendererImpl(this))
 {
-  
+
 }
 
 
@@ -540,7 +542,7 @@
   LOG_DEBUG(logger) << "OverlayRenderer::DrawInnerCleanup(): absolute_geo: " << absolute_geo.width << "/" << absolute_geo.height;
   LOG_DEBUG(logger) << "OverlayRenderer::DrawInnerCleanup(): geo:          " << geo.width << "/" << geo.height;
 }
-  
+
 }
 
 

=== modified file 'plugins/unityshell/src/PlacesGroup.cpp'
--- plugins/unityshell/src/PlacesGroup.cpp	2012-03-13 16:19:52 +0000
+++ plugins/unityshell/src/PlacesGroup.cpp	2012-03-20 23:22:18 +0000
@@ -41,9 +41,9 @@
 #include <Nux/Utils.h>
 #include <UnityCore/Variant.h>
 #include "DashStyle.h"
+#include "LineSeparator.h"
 #include "ubus-server.h"
 #include "UBusMessages.h"
- #include "Introspectable.h"
 
 namespace unity
 {
@@ -55,12 +55,8 @@
 
 // Category  highlight
 const int kHighlightHeight = 24;
-const int kHighlightWidthSubtractor = 16;
-const int kHighlightLeftPadding = 11;
-
-// Line Separator
-const int kSeparatorLeftPadding = 16;
-const int kSeparatorWidthSubtractor = 10;
+const int kHighlightRightPadding = 10 - 3; // -3 because the scrollbar is not a real overlay scrollbar!
+const int kHighlightLeftPadding = 10;
 
 // Font
 const char* const NAME_LABEL_FONT = "Ubuntu 13"; // 17px = 13
@@ -116,23 +112,26 @@
     _n_visible_items_in_unexpand_mode(0),
     _n_total_items(0)
 {
+  dash::Style& style = dash::Style::Instance();
+
   SetAcceptKeyNavFocusOnMouseDown(false);
   SetAcceptKeyNavFocusOnMouseEnter(false);
 
-  nux::BaseTexture* arrow = dash::Style::Instance().GetGroupUnexpandIcon();
+  nux::BaseTexture* arrow = style.GetGroupUnexpandIcon();
 
   _cached_name = NULL;
   _group_layout = new nux::VLayout("", NUX_TRACKER_LOCATION);
-  _group_layout->SetHorizontalExternalMargin(20);
-  _group_layout->SetVerticalExternalMargin(1);
 
-  _group_layout->AddLayout(new nux::SpaceLayout(15,15,15,15), 0);
+  // -2 because the icons have an useless border.
+  int top_space = style.GetPlacesGroupTopSpace() - 2;
+  _group_layout->AddLayout(new nux::SpaceLayout(top_space, top_space, top_space, top_space), 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);
+  _header_layout->SetLeftAndRightPadding(style.GetCategoryHeaderLeftPadding(), 0);
+  _header_layout->SetSpaceBetweenChildren(10);
   _header_view->SetLayout(_header_layout);
 
   _icon = new IconTexture("", 24);
@@ -169,6 +168,16 @@
   _expand_icon->SetVisible(false);
   _expand_layout->AddView(_expand_icon, 0, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_FIX);
 
+  separator_layout_ = new nux::HLayout();
+  separator_layout_->SinkReference();
+  separator_layout_->SetLeftAndRightPadding(style.GetCategorySeparatorLeftPadding(),
+                                            style.GetCategorySeparatorRightPadding() - style.GetScrollbarWidth());
+
+  separator_ = new HSeparator;
+  separator_layout_->AddView(separator_, 1);
+
+  draw_separator.changed.connect(sigc::mem_fun(this, &PlacesGroup::DrawSeparatorChanged));
+
   SetLayout(_group_layout);
 
   // don't need to disconnect these signals as they are disconnected when this object destroys the contents
@@ -200,9 +209,21 @@
   if (_cached_name != NULL)
     g_free(_cached_name);
 
+  if (separator_layout_)
+    separator_layout_->UnReference();
+
   delete _focus_layer;
 }
 
+void PlacesGroup::DrawSeparatorChanged(bool draw)
+{
+  if (draw and !separator_layout_->IsChildOf(_group_layout))
+    _group_layout->AddView(separator_layout_, 0);
+  else if (!draw and separator_layout_->IsChildOf(_group_layout))
+    _group_layout->RemoveChildObject(separator_layout_);
+  QueueDraw();
+}
+
 void
 PlacesGroup::OnLabelActivated(nux::Area* label)
 {
@@ -265,7 +286,14 @@
   if (i)
     AddChild(i);
   _child_view = view;
-  _group_layout->AddView(_child_view, 1);
+
+  nux::VLayout* layout = new nux::VLayout();
+  layout->AddView(_child_view, 0);
+
+  layout->SetLeftAndRightPadding(25, 0);
+  _group_layout->AddLayout(new nux::SpaceLayout(8,8,8,8), 0); // top padding
+  _group_layout->AddLayout(layout, 1);
+
   QueueDraw();
 }
 
@@ -370,7 +398,7 @@
     if (_focus_layer)
       delete _focus_layer;
 
-    _focus_layer = dash::Style::Instance().FocusOverlay(geo.width - kHighlightWidthSubtractor, kHighlightHeight);
+    _focus_layer = dash::Style::Instance().FocusOverlay(geo.width - kHighlightLeftPadding - kHighlightRightPadding, kHighlightHeight);
 
     _cached_geometry = geo;
   }
@@ -386,27 +414,11 @@
 
   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_separator)
-  {
-    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);
-  }
-
-  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;
+    geo.width = base.width - kHighlightRightPadding - kHighlightLeftPadding;
+    geo.x += kHighlightLeftPadding;
 
     _focus_layer->SetGeometry(geo);
     _focus_layer->Renderlayer(graphics_engine);

=== modified file 'plugins/unityshell/src/PlacesGroup.h'
--- plugins/unityshell/src/PlacesGroup.h	2012-03-13 16:19:52 +0000
+++ plugins/unityshell/src/PlacesGroup.h	2012-03-20 23:22:18 +0000
@@ -41,6 +41,9 @@
 namespace unity
 {
 
+
+class HSeparator;
+
 class PlacesGroup : public dash::AbstractPlacesGroup, public debug::Introspectable
 {
   NUX_DECLARE_OBJECT_TYPE(PlacesGroup, dash::AbstractPlacesGroup);
@@ -93,6 +96,7 @@
   bool HeaderHasKeyFocus() const;
   bool ShouldBeHighlighted() const;
 
+  void DrawSeparatorChanged(bool draw);
   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);
@@ -109,6 +113,8 @@
   nux::HLayout* _expand_layout;
   nux::View*  _child_view;
   nux::AbstractPaintLayer* _focus_layer;
+  nux::HLayout* separator_layout_;
+  HSeparator* separator_;
 
   IconTexture*          _icon;
   nux::StaticCairoText* _name;
@@ -121,7 +127,6 @@
   guint _n_visible_items_in_unexpand_mode;
   guint _n_total_items;
   char* _cached_name;
-  bool  _draw_sep;
   nux::Geometry _cached_geometry;
 
   UBusManager _ubus;

=== modified file 'plugins/unityshell/src/PlacesVScrollBar.cpp'
--- plugins/unityshell/src/PlacesVScrollBar.cpp	2012-03-14 10:27:43 +0000
+++ plugins/unityshell/src/PlacesVScrollBar.cpp	2012-03-20 23:22:18 +0000
@@ -28,6 +28,12 @@
   : VScrollBar(NUX_FILE_LINE_PARAM),
     _slider_texture(NULL)
 {
+  _scroll_up_button->SetMaximumHeight(15);
+  _scroll_up_button->SetMinimumHeight(15);
+
+  _scroll_down_button->SetMaximumHeight(15);
+  _scroll_down_button->SetMinimumHeight(15);
+
   _slider->SetMinimumWidth(3);
   _slider->SetMaximumWidth(3);
   SetMinimumWidth(3);
@@ -58,8 +64,8 @@
 void
 PlacesVScrollBar::Draw(nux::GraphicsEngine& gfxContext, bool force_draw)
 {
-  nux::Color         color = nux::color::White;
-  nux::Geometry      base  = GetGeometry();
+  nux::Color color = nux::color::White;
+  nux::Geometry const& base  = GetGeometry();
   nux::TexCoordXForm texxform;
 
   gfxContext.PushClippingRectangle(base);
@@ -77,7 +83,8 @@
 
   if (content_height_ > container_height_)
   {
-    nux::Geometry slider_geo = _slider->GetGeometry();
+    nux::Geometry const& slider_geo = _slider->GetGeometry();
+
     gfxContext.QRP_1Tex(slider_geo.x,
                         slider_geo.y,
                         slider_geo.width,

=== modified file 'plugins/unityshell/src/ResultViewGrid.cpp'
--- plugins/unityshell/src/ResultViewGrid.cpp	2012-02-17 16:48:25 +0000
+++ plugins/unityshell/src/ResultViewGrid.cpp	2012-03-20 23:22:18 +0000
@@ -61,9 +61,10 @@
   , recorded_dash_height_(-1)
   , mouse_last_x_(-1)
   , mouse_last_y_(-1)
+  , extra_horizontal_spacing_(0)
 {
   SetAcceptKeyNavFocusOnMouseDown(false);
-  
+
   auto needredraw_lambda = [&](int value)
   {
     NeedRedraw();
@@ -268,6 +269,16 @@
   {
     total_height = renderer_->height;
   }
+
+  int width = (items_per_row * renderer_->width) + (padding*2) + ((items_per_row - 1) * horizontal_spacing);
+  int geo_width = GetBaseWidth();
+  int extra_width = geo_width - (width + 25-3);
+
+  if (items_per_row != 1)
+    extra_horizontal_spacing_ = extra_width / (items_per_row - 1);
+  if (extra_horizontal_spacing_ < 0)
+    extra_horizontal_spacing_ = 0;
+
   SetMinimumHeight(total_height + (padding * 2));
   SetMaximumHeight(total_height + (padding * 2));
   PositionPreview();
@@ -477,7 +488,7 @@
   selected_index_ = std::min(static_cast<int>(results_.size() - 1), selected_index_);
   focused_uri_ = results_[selected_index_].uri;
 
-  int focused_x = (renderer_->width + horizontal_spacing) * (selected_index_ % items_per_row);
+  int focused_x = (renderer_->width + horizontal_spacing + extra_horizontal_spacing_) * (selected_index_ % items_per_row);
   int focused_y = (renderer_->height + vertical_spacing) * (selected_index_ / items_per_row);
 
   ubus_.SendMessage(UBUS_RESULT_VIEW_KEYNAV_CHANGED,
@@ -510,19 +521,19 @@
     if (direction == nux::KEY_NAV_UP && expanded)
     {
       // This View just got focused through keyboard navigation and the
-      // focus is comming from the bottom. We want to focus the 
+      // focus is comming from the bottom. We want to focus the
       // first item (on the left) of the last row in this grid.
 
       int total_rows = std::ceil(results_.size() / (double)items_per_row);
       selected_index_ = items_per_row * (total_rows-1);
 
-      focused_x = (renderer_->width + horizontal_spacing) * (selected_index_ % items_per_row);
+      focused_x = (renderer_->width + horizontal_spacing + extra_horizontal_spacing_) * (selected_index_ % items_per_row);
       focused_y = (renderer_->height + vertical_spacing) * (selected_index_ / items_per_row);
 
     }
     else
     {
-      focused_x = (renderer_->width + horizontal_spacing) * (selected_index_ % items_per_row);
+      focused_x = (renderer_->width + horizontal_spacing + extra_horizontal_spacing_) * (selected_index_ % items_per_row);
       focused_y = (renderer_->height + vertical_spacing) * (selected_index_ / items_per_row);
     }
 
@@ -670,9 +681,10 @@
           offset_y = 0;
         }
         nux::Geometry render_geo(x_position, y_position, renderer_->width, renderer_->height);
+//nux::GetPainter().Paint2DQuadColor(GfxContext, render_geo, nux::color::Blue*0.20);
         renderer_->Render(GfxContext, results_[index], state, render_geo, offset_x, offset_y);
 
-        x_position += renderer_->width + horizontal_spacing;
+        x_position += renderer_->width + horizontal_spacing + extra_horizontal_spacing_;
       }
     }
 
@@ -734,7 +746,7 @@
 {
   uint items_per_row = GetItemsPerRow();
 
-  uint column_size = renderer_->width + horizontal_spacing;
+  uint column_size = renderer_->width + horizontal_spacing + extra_horizontal_spacing_;
   uint row_size = renderer_->height + vertical_spacing;
 
   if (preview_layout_ != NULL && (y - padding) / row_size > preview_row_)
@@ -908,11 +920,11 @@
   last_mouse_down_y_ = -1;
   current_drag_uri_.clear();
   current_drag_icon_name_.clear();
-  
+
   // We need this because the drag can start in a ResultViewGrid and can
   // end in another ResultViewGrid
   EmitMouseLeaveSignal(0, 0, 0, 0);
-  
+
   // We need an extra mouse motion to highlight the icon under the mouse
   // as soon as dnd finish
   Display* display = nux::GetGraphicsDisplay()->GetX11Display();

=== modified file 'plugins/unityshell/src/ResultViewGrid.h'
--- plugins/unityshell/src/ResultViewGrid.h	2012-02-22 10:35:19 +0000
+++ plugins/unityshell/src/ResultViewGrid.h	2012-03-20 23:22:18 +0000
@@ -106,6 +106,8 @@
   int mouse_last_x_;
   int mouse_last_y_;
 
+  int extra_horizontal_spacing_;
+
   UBusManager ubus_;
 
 };

=== modified file 'plugins/unityshell/src/SearchBar.cpp'
--- plugins/unityshell/src/SearchBar.cpp	2012-03-16 01:48:22 +0000
+++ plugins/unityshell/src/SearchBar.cpp	2012-03-20 23:22:18 +0000
@@ -46,21 +46,13 @@
 namespace
 {
 const float kExpandDefaultIconOpacity = 1.0f;
-const int external_margin_vertical = 8;
-const int external_margin_horizontal = 7;
 const int LIVE_SEARCH_TIMEOUT = 40;
 const int SPINNER_TIMEOUT = 100;
 
-const int SPINNER_HEIGHT = 48; // To don't break the current layout, let's use a fixed height for the spinner.
-const int SPACE_BETWEEN_SPINNER_AND_TEXT = 4;
-const int LEFT_INTERNAL_PADDING = 9;
-
-
-// Highlight
+const int SPACE_BETWEEN_SPINNER_AND_TEXT = 5;
+const int LEFT_INTERNAL_PADDING = 7;
+
 const int HIGHLIGHT_HEIGHT = 24;
-const int HIGHLIGHT_WIDTH = 292;
-const int HIGHLIGHT_LEFT_PADDING = 5;
-const int HIGHLIGHT_RIGHT_PADDING = 4;
 
 // Fonts
 const std::string HINT_LABEL_FONT_SIZE = "20px";
@@ -133,7 +125,7 @@
   , show_filter_hint_(true)
   , expander_view_(nullptr)
   , show_filters_(nullptr)
-  , search_bar_width_(640)
+  , search_bar_width_(621)
   , live_search_timeout_(0)
   , start_spinner_timeout_(0)
 {
@@ -178,13 +170,12 @@
   bg_layer_ = new nux::ColorLayer(nux::Color(0xff595853), true);
 
   layout_ = new nux::HLayout(NUX_TRACKER_LOCATION);
-  layout_->SetHorizontalInternalMargin(SPACE_BETWEEN_SPINNER_AND_TEXT);
-  layout_->SetTopAndBottomPadding(external_margin_vertical);
-  layout_->SetLeftAndRightPadding(external_margin_horizontal + LEFT_INTERNAL_PADDING, external_margin_horizontal);
+  layout_->SetLeftAndRightPadding(LEFT_INTERNAL_PADDING, 10);
+  layout_->SetSpaceBetweenChildren(SPACE_BETWEEN_SPINNER_AND_TEXT);
   SetLayout(layout_);
 
   spinner_ = new SearchBarSpinner();
-  spinner_->SetMinMaxSize(icon->GetWidth(), SPINNER_HEIGHT);
+  spinner_->SetMinMaxSize(icon->GetWidth(), icon->GetHeight());
   spinner_->mouse_click.connect(sigc::mem_fun(this, &SearchBar::OnClearClicked));
   layout_->AddView(spinner_, 0, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_FULL);
 
@@ -222,7 +213,8 @@
     show_filters_->SetVisible(false);
     show_filters_->SetFont(SHOW_FILTERS_LABEL_DEFAULT_FONT.c_str());
     show_filters_->SetTextColor(nux::color::White);
-    show_filters_->SetTextAlignment(nux::StaticCairoText::NUX_ALIGN_LEFT);
+    show_filters_->SetTextAlignment(nux::StaticCairoText::NUX_ALIGN_RIGHT);
+    show_filters_->SetLines(1);
 
     nux::BaseTexture* arrow;
     arrow = dash::Style::Instance().GetGroupExpandIcon();
@@ -235,7 +227,6 @@
 
     filter_layout_ = new nux::HLayout();
     filter_layout_->SetHorizontalInternalMargin(8);
-    filter_layout_->SetHorizontalExternalMargin(6);
     filter_layout_->AddView(show_filters_, 0, nux::MINOR_POSITION_CENTER);
 
     arrow_layout_  = new nux::VLayout();
@@ -254,6 +245,10 @@
     expander_view_->SetLayout(filter_layout_);
     layout_->AddView(expander_view_, 0, nux::MINOR_POSITION_RIGHT, nux::MINOR_SIZE_FULL);
 
+    // Fix bug #917047
+    show_filters_->SetMaximumWidth(dash::Style::Instance().GetFilterBarWidth() - 60);
+    show_filters_->SetMinimumWidth(dash::Style::Instance().GetFilterBarWidth() - 60);
+
     // Lambda functions
     auto mouse_expand = [&](int, int, unsigned long, unsigned long)
     {
@@ -422,23 +417,25 @@
   GfxContext.PushClippingRectangle(base);
   nux::GetPainter().PaintBackground(GfxContext, base);
 
-  bg_layer_->SetGeometry(nux::Geometry(base.x, base.y, last_width_, base.height));
+  bg_layer_->SetGeometry(nux::Geometry(base.x, base.y, last_width_, last_height_));
   nux::GetPainter().RenderSinglePaintLayer(GfxContext,
                                            bg_layer_->GetGeometry(),
                                            bg_layer_);
 
   if (ShouldBeHighlighted())
   {
+    dash::Style& style = dash::Style::Instance();
+
     nux::Geometry geo(show_filters_->GetGeometry());
     nux::Geometry const& geo_arrow = arrow_layout_->GetGeometry();
 
     geo.y -= (HIGHLIGHT_HEIGHT- geo.height) / 2;
     geo.height = HIGHLIGHT_HEIGHT;
-    geo.width = HIGHLIGHT_WIDTH + HIGHLIGHT_LEFT_PADDING + HIGHLIGHT_RIGHT_PADDING;
-    geo.x = geo_arrow.x + (geo_arrow.width - 1) - geo.width + HIGHLIGHT_RIGHT_PADDING;
+    geo.width = style.GetFilterBarWidth() + style.GetFilterBarLeftPadding() + style.GetFilterBarRightPadding();
+    geo.x = geo_arrow.x + (geo_arrow.width - 1) - geo.width + style.GetFilterBarLeftPadding();
 
     if (!highlight_layer_)
-      highlight_layer_.reset(dash::Style::Instance().FocusOverlay(geo.width, geo.height));
+      highlight_layer_.reset(style.FocusOverlay(geo.width, geo.height));
 
     highlight_layer_->SetGeometry(geo);
     highlight_layer_->Renderlayer(GfxContext);
@@ -515,9 +512,7 @@
 
 void SearchBar::UpdateBackground(bool force)
 {
-  int PADDING = 12;
   int RADIUS = 5;
-  int x, y, width, height;
   nux::Geometry geo(GetGeometry());
   geo.width = layered_layout_->GetGeometry().width;
 
@@ -534,43 +529,21 @@
   last_width_ = geo.width;
   last_height_ = geo.height;
 
-  if (disable_glow)
-    PADDING = 2;
-
-  x = y = PADDING - 1;
-
-  width = last_width_ - (2 * PADDING);
-  height = last_height_ - (2 * PADDING) + 1;
-
   nux::CairoGraphics cairo_graphics(CAIRO_FORMAT_ARGB32, last_width_, last_height_);
   cairo_t* cr = cairo_graphics.GetContext();
 
   cairo_graphics.DrawRoundedRectangle(cr,
                                       1.0f,
-                                      x,
-                                      y,
+                                      1 + 0.5, 1 + 0.5,
                                       RADIUS,
-                                      width,
-                                      height,
-                                      true);
-
-  // Disable glow effect #929183
-  //cairo_set_source_rgba(cr, 1.0f, 1.0f, 1.0f, 1.0f);
-  //cairo_set_line_width(cr, 1.0);
-  //cairo_stroke_preserve(cr);
-  //cairo_graphics.BlurSurface (3, cairo_get_target (cr));
-
-  // XXX: Not sure this code is 100% correct.
-  cairo_operator_t op = CAIRO_OPERATOR_OVER;
-  op = cairo_get_operator (cr);
-  cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
-  cairo_set_source_rgba(cr, 0.0f, 0.0f, 0.0f, 0.35f);
-  cairo_fill_preserve(cr);
-  cairo_set_operator (cr, op);
-  cairo_set_source_rgba(cr, 0.0f, 0.0f, 0.0f, 0.35f);
-  cairo_fill_preserve(cr);
-  cairo_set_source_rgba(cr, 1.0f, 1.0f, 1.0f, 0.8f);
-  cairo_set_line_width(cr, 1.0);
+                                      last_width_ - 1 - 2, last_height_ - 1 - 2,
+                                      false);
+
+  cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
+  cairo_set_source_rgba(cr, 0.0f, 0.0f, 0.0f, 0.57f);
+  cairo_fill_preserve(cr);
+  cairo_set_line_width(cr, 1);
+  cairo_set_source_rgba(cr, 1.0f, 1.0f, 1.0f, 1.0f);
   cairo_stroke(cr);
 
   cairo_destroy(cr);
@@ -579,6 +552,7 @@
   nux::TexCoordXForm texxform;
   texxform.SetTexCoordType(nux::TexCoordXForm::OFFSET_COORD);
   texxform.SetWrap(nux::TEXWRAP_REPEAT, nux::TEXWRAP_REPEAT);
+
   if (bg_layer_)
     delete bg_layer_;