Merge lp:~gordallott/unity/newbg into lp:~gordallott/unity/fix-overlay-race-condition

[Gord Allott]

Adds a new background gradient to the dash and panel, as well as removes some separator lines
Design request, visual changes, no tests

=== modified file 'dash/CoverflowResultView.cpp'
--- dash/CoverflowResultView.cpp	2012-08-23 14:23:08 +0000
+++ dash/CoverflowResultView.cpp	2012-09-13 15:55:51 +0000
@@ -161,11 +161,12 @@
 
   ubus_.RegisterInterest(UBUS_DASH_PREVIEW_NAVIGATION_REQUEST, [&] (GVariant* data) {
     int nav_mode = 0;
-    gchar* uri = NULL;
-    gchar* proposed_unique_id = NULL;
+    glib::String uri;
+    glib::String proposed_unique_id;
+
     g_variant_get(data, "(iss)", &nav_mode, &uri, &proposed_unique_id);
    
-    if (std::string(proposed_unique_id) != parent_->unique_id())
+    if (proposed_unique_id.Str() != parent_->unique_id())
       return;
 
     unsigned num_results = coverflow_->model()->Items().size();
@@ -192,10 +193,6 @@
       ubus_.SendMessage(UBUS_DASH_PREVIEW_INFO_PAYLOAD, 
                               g_variant_new("(iii)", 0, left_results, right_results));
     }
-
-    g_free(uri);
-    g_free(proposed_unique_id);
-
   });
 }
 
 
=== modified file 'dash/DashController.cpp'
--- dash/DashController.cpp	2012-09-12 08:36:06 +0000
+++ dash/DashController.cpp	2012-09-13 15:55:51 +0000
@@ -284,17 +284,8 @@
     return;
   }
 
-  /* GetIdealMonitor must get called before visible_ is set */
   monitor_ = GetIdealMonitor();
 
-  // The launcher must receive UBUS_OVERLAY_SHOW before window_->EnableInputWindow().
-  // Other wise the Launcher gets focus for X, which causes XIM to fail.
-  sources_.AddTimeout(0, [this] {
-    GVariant* info = g_variant_new(UBUS_OVERLAY_FORMAT_STRING, "dash", TRUE, monitor_);
-    ubus_manager_.SendMessage(UBUS_OVERLAY_SHOWN, info);
-    return false;
-  });
-
   view_->AboutToShow();
 
   window_->ShowWindow(true);
@@ -311,6 +302,9 @@
   visible_ = true;
 
   StartShowHideTimeline();
+
+  GVariant* info = g_variant_new(UBUS_OVERLAY_FORMAT_STRING, "dash", TRUE, monitor_);
+  ubus_manager_.SendMessage(UBUS_OVERLAY_SHOWN, info);
 }
 
 void Controller::HideDash(bool restore)
@@ -400,6 +394,11 @@
                                   .add("monitor", monitor_);
 }
 
+bool Controller::IsVisible() const
+{
+  return visible_;
+}
+
 void Controller::OnBusAcquired(GObject *obj, GAsyncResult *result, gpointer user_data)
 {
   glib::Error error;
@@ -447,6 +446,5 @@
 }
 
 
-
 }
 }
 
=== modified file 'dash/DashController.h'
--- dash/DashController.h	2012-09-11 10:47:15 +0000
+++ dash/DashController.h	2012-09-13 15:55:51 +0000
@@ -59,6 +59,8 @@
 
   void HideDash(bool restore_focus = true);
 
+  bool IsVisible() const;
+
 protected:
   std::string GetName() const;
   void AddProperties(GVariantBuilder* builder);
@@ -104,7 +106,6 @@
   sigc::connection screen_ungrabbed_slot_;
   glib::SignalManager sig_manager_;
   glib::TimeoutSeconds ensure_timeout_;
-  glib::SourceManager sources_;
   Animator timeline_animator_;
   UBusManager ubus_manager_;
   unsigned int dbus_owner_;
 
=== modified file 'dash/FilterBar.cpp'
--- dash/FilterBar.cpp	2012-05-06 23:48:38 +0000
+++ dash/FilterBar.cpp	2012-09-13 15:55:51 +0000
@@ -82,8 +82,6 @@
   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)
@@ -99,8 +97,6 @@
       break;
     }
   }
-
-  UpdateDrawSeparators();
 }
 
 void FilterBar::Draw(nux::GraphicsEngine& GfxContext, bool force_draw)
@@ -120,24 +116,6 @@
   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)
-  {
-    FilterExpanderLabel* widget = dynamic_cast<FilterExpanderLabel*>(*rit);
-
-    if (!widget)
-      continue;
-
-    widget->draw_separator = found_one;
-    found_one = true;
-  }
-}
-
 //
 // Key navigation
 //
 
=== modified file 'dash/FilterBar.h'
--- dash/FilterBar.h	2012-05-06 23:48:38 +0000
+++ dash/FilterBar.h	2012-09-13 15:55:51 +0000
@@ -60,7 +60,6 @@
 
 private:
   void Init();
-  void UpdateDrawSeparators();
 
   FilterFactory factory_;
   Filters::Ptr filters_;
 
=== modified file 'dash/LensBar.cpp'
--- dash/LensBar.cpp	2012-08-09 14:28:50 +0000
+++ dash/LensBar.cpp	2012-09-13 15:55:51 +0000
@@ -31,7 +31,9 @@
 
 nux::logging::Logger logger("unity.dash.lensbar");
 
-const int LENSBAR_HEIGHT = 44;
+// according to Q design the inner area of the lensbar should be 40px
+// (without any borders)
+const int LENSBAR_HEIGHT = 41;
 
 }
 
 
=== modified file 'dash/LensView.cpp'
--- dash/LensView.cpp	2012-08-31 15:46:18 +0000
+++ dash/LensView.cpp	2012-09-13 15:55:51 +0000
@@ -147,7 +147,14 @@
   lens_->connected.changed.connect([&](bool is_connected) { if (is_connected) initial_activation_ = true; });
   lens_->categories_reordered.connect(sigc::mem_fun(this, &LensView::OnCategoryOrderChanged));
   search_string.SetGetterFunction(sigc::mem_fun(this, &LensView::get_search_string));
-  filters_expanded.changed.connect([&](bool expanded) { fscroll_view_->SetVisible(expanded); QueueRelayout(); OnColumnsChanged(); });
+  filters_expanded.changed.connect([&](bool expanded) 
+  { 
+    fscroll_view_->SetVisible(expanded); 
+    QueueRelayout(); 
+    OnColumnsChanged();
+    ubus_manager_.SendMessage(UBUS_REFINE_STATUS, 
+                              g_variant_new(UBUS_REFINE_STATUS_FORMAT_STRING, expanded ? TRUE : FALSE));
+  });
   view_type.changed.connect(sigc::mem_fun(this, &LensView::OnViewTypeChanged));
 
   ubus_manager_.RegisterInterest(UBUS_RESULT_VIEW_KEYNAV_CHANGED, [&] (GVariant* data) {
@@ -189,10 +196,15 @@
 
   scroll_view_ = new LensScrollView(new PlacesVScrollBar(NUX_TRACKER_LOCATION),
                                     NUX_TRACKER_LOCATION);
-  scroll_view_->EnableVerticalScrollBar(true);
+  scroll_view_->EnableVerticalScrollBar(false);
   scroll_view_->EnableHorizontalScrollBar(false);
   layout_->AddView(scroll_view_);
 
+  scroll_view_->OnGeometryChanged.connect([this] (nux::Area *area, nux::Geometry& geo)
+  {
+    CheckScrollBarState();
+  });
+
   scroll_layout_ = new nux::VLayout(NUX_TRACKER_LOCATION);
   scroll_view_->SetLayout(scroll_layout_);
   scroll_view_->SetRightArea(show_filters);
@@ -385,6 +397,8 @@
   scroll_layout_->AddView(group, 0, nux::MinorDimensionPosition::eAbove,
                           nux::MinorDimensionSize::eFull, 100.0f,
                           (nux::LayoutPosition)index);
+  
+  group->SetMinimumWidth(GetGeometry().width+20);
 }
 
 void LensView::OnCategoryOrderChanged()
@@ -612,6 +626,20 @@
   ResultViewGrid* grid = static_cast<ResultViewGrid*>(group->GetChildView());
   grid->expanded = group->GetExpanded();
   ubus_manager_.SendMessage(UBUS_PLACE_VIEW_QUEUE_DRAW);
+
+  CheckScrollBarState();
+}
+
+void LensView::CheckScrollBarState()
+{
+  if (scroll_layout_->GetGeometry().height > scroll_view_->GetGeometry().height)
+  {
+    scroll_view_->EnableVerticalScrollBar(true); 
+  }
+  else
+  {
+    scroll_view_->EnableVerticalScrollBar(false); 
+  }
 }
 
 void LensView::OnColumnsChanged()
 
=== modified file 'dash/LensView.h'
--- dash/LensView.h	2012-08-29 14:50:19 +0000
+++ dash/LensView.h	2012-09-13 15:55:51 +0000
@@ -88,6 +88,7 @@
   void OnResultRemoved(Result const& result);
   void UpdateCounts(PlacesGroup* group);
   void OnGroupExpanded(PlacesGroup* group);
+  void CheckScrollBarState();
   void OnColumnsChanged();
   void OnFilterAdded(Filter::Ptr filter);
   void OnFilterRemoved(Filter::Ptr filter);
 
=== modified file 'dash/PlacesGroup.cpp'
--- dash/PlacesGroup.cpp	2012-08-20 16:49:10 +0000
+++ dash/PlacesGroup.cpp	2012-09-13 15:55:51 +0000
@@ -58,6 +58,7 @@
 const nux::Color kExpandDefaultTextColor(1.0f, 1.0f, 1.0f, 0.5f);
 const float kExpandDefaultIconOpacity = 0.5f;
 
+const int kCategoryIconSize = 22;
 // Category  highlight
 const int kHighlightHeight = 24;
 const int kHighlightRightPadding = 10 - 3; // -3 because the scrollbar is not a real overlay scrollbar!
@@ -114,7 +115,7 @@
 PlacesGroup::PlacesGroup()
   : AbstractPlacesGroup(),
     _child_view(nullptr),
-    _is_expanded(true),
+    _is_expanded(false),
     _n_visible_items_in_unexpand_mode(0),
     _n_total_items(0),
     _category_index(0),
@@ -127,6 +128,21 @@
   SetAcceptKeyNavFocusOnMouseEnter(false);
 
   nux::BaseTexture* arrow = style.GetGroupUnexpandIcon();
+  
+  _background = style.GetCategoryBackground();
+  _background_nofilters = style.GetCategoryBackgroundNoFilters();
+
+  nux::ROPConfig rop;
+  rop.Blend = true;
+  rop.SrcBlend = GL_ONE;
+  rop.DstBlend = GL_ONE_MINUS_SRC_ALPHA;
+
+  nux::TexCoordXForm texxform;
+  _background_layer.reset(new nux::TextureLayer(_background->GetDeviceTexture(), 
+                          texxform, 
+                          nux::color::White,
+                          false,
+                          rop));
 
   _group_layout = new nux::VLayout("", NUX_TRACKER_LOCATION);
 
@@ -142,8 +158,8 @@
   _header_layout->SetSpaceBetweenChildren(10);
   _header_view->SetLayout(_header_layout);
 
-  _icon = new IconTexture("", 24);
-  _icon->SetMinMaxSize(24, 24);
+  _icon = new IconTexture("", kCategoryIconSize);
+  _icon->SetMinMaxSize(kCategoryIconSize, kCategoryIconSize);
   _header_layout->AddView(_icon, 0, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_FIX);
 
   _text_layout = new nux::HLayout(NUX_TRACKER_LOCATION);
@@ -176,15 +192,6 @@
   _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_->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
@@ -206,15 +213,8 @@
     else
       nux::GetWindowCompositor().SetKeyFocusArea(GetHeaderFocusableView(), direction);
   });
-}
 
-void PlacesGroup::DrawSeparatorChanged(bool draw)
-{
-  if (draw and !separator_layout_->IsChildOf(_group_layout))
-    _group_layout->AddView(separator_layout_.GetPointer(), 0);
-  else if (!draw and separator_layout_->IsChildOf(_group_layout))
-    _group_layout->RemoveChildObject(separator_layout_.GetPointer());
-  QueueDraw();
+  SetMinimumWidth(2000);
 }
 
 void
@@ -252,7 +252,7 @@
 
   if (g_strcmp0(renderer_name, "tile-horizontal") == 0)
     (static_cast<dash::ResultView*>(_child_view))->SetModelRenderer(new dash::ResultRendererHorizontalTile(NUX_TRACKER_LOCATION));
-  else
+  else if (g_strcmp0(renderer_name, "tile-vertical"))
     (static_cast<dash::ResultView*>(_child_view))->SetModelRenderer(new dash::ResultRendererTile(NUX_TRACKER_LOCATION));
 }
 
@@ -277,7 +277,7 @@
 void
 PlacesGroup::SetIcon(std::string const& path_to_emblem)
 {
-  _icon->SetByIconName(path_to_emblem, 24);
+  _icon->SetByIconName(path_to_emblem, kCategoryIconSize);
 }
 
 void
@@ -395,6 +395,35 @@
 {
   if (GetChildView())
   {
+    
+    nux::ROPConfig rop;
+    rop.Blend = true;
+    rop.SrcBlend = GL_ONE;
+    rop.DstBlend = GL_ONE_MINUS_SRC_ALPHA;
+
+    nux::TexCoordXForm texxform;
+    if (_n_visible_items_in_unexpand_mode < 6 && _using_nofilters_background)
+    {
+      LOG_DEBUG(logger) << "drawing unexpanded texture";
+      _background_layer.reset(new nux::TextureLayer(_background->GetDeviceTexture(), 
+                              texxform, 
+                              nux::color::White,
+                              false,
+                              rop));
+      _using_nofilters_background = false;
+    }
+    else if (_n_visible_items_in_unexpand_mode >= 6 && !_using_nofilters_background)
+    {
+      LOG_DEBUG(logger) << "drawing expanded texture";
+      _background_layer.reset(new nux::TextureLayer(_background_nofilters->GetDeviceTexture(), 
+                              texxform, 
+                              nux::color::White,
+                              false,
+                              rop));
+      
+      _using_nofilters_background = true;
+    }
+
     Refresh();
     QueueDraw();
     _group_layout->QueueDraw();
@@ -416,10 +445,8 @@
   if (_cached_geometry.GetWidth() != geo.GetWidth())
   {
     _focus_layer.reset(dash::Style::Instance().FocusOverlay(geo.width - kHighlightLeftPadding - kHighlightRightPadding, kHighlightHeight));
-
     _cached_geometry = geo;
   }
-
   return ret;
 }
 
@@ -429,6 +456,8 @@
   nux::Geometry const& base = GetGeometry();
   graphics_engine.PushClippingRectangle(base);
 
+  LOG_DEBUG(logger) << "places group geo: " << base.width;
+
   if (ShouldBeHighlighted())
   {
     nux::Geometry geo(_header_layout->GetGeometry());
@@ -439,6 +468,20 @@
     _focus_layer->Renderlayer(graphics_engine);
   }
 
+  nux::Geometry bg_geo = GetGeometry();
+  int bg_width = 0;
+  if (_using_nofilters_background)
+    bg_width = _background_nofilters->GetWidth();
+  else
+    bg_width = _background->GetWidth();
+
+  bg_geo.x = std::max(bg_geo.width - bg_width,0);
+  
+  bg_geo.width = std::min(bg_width, bg_geo.GetWidth()) + 10;
+  bg_geo.height = _background->GetHeight();
+  
+  _background_layer->SetGeometry(bg_geo);
+  _background_layer->Renderlayer(graphics_engine);
   graphics_engine.PopClippingRectangle();
 }
 
@@ -448,7 +491,24 @@
   nux::Geometry const& base = GetGeometry();
 
   graphics_engine.PushClippingRectangle(base);
+  nux::Geometry bg_geo = GetGeometry();
+  
+  int bg_width = 0;
+  if (_using_nofilters_background)
+    bg_width = _background_nofilters->GetWidth();
+  else
+    bg_width = _background->GetWidth();
+  
+  // if the dash is smaller, resize to fit, otherwise move to the right edge
+  bg_geo.x = std::max(bg_geo.width - bg_width, 0);
+  bg_geo.width = std::min(bg_width, bg_geo.GetWidth()) + 10;
+  
+  bg_geo.height = _background->GetHeight();
 
+  if (!IsFullRedraw())
+  {
+    nux::GetPainter().PushLayer(graphics_engine, bg_geo, _background_layer.get());
+  }
   if (ShouldBeHighlighted() && !IsFullRedraw() && _focus_layer)
   {
     nux::GetPainter().PushLayer(graphics_engine, _focus_layer->GetGeometry(), _focus_layer.get());
 
=== modified file 'dash/PlacesGroup.h'
--- dash/PlacesGroup.h	2012-08-20 16:49:10 +0000
+++ dash/PlacesGroup.h	2012-09-13 15:55:51 +0000
@@ -123,8 +123,6 @@
   nux::HLayout* _expand_label_layout;
   nux::HLayout* _expand_layout;
   nux::View*  _child_view;
-  nux::ObjectPtr<nux::HLayout> separator_layout_;
-  HSeparator* separator_;
   std::unique_ptr<nux::AbstractPaintLayer> _focus_layer;
 
   IconTexture*          _icon;
@@ -132,12 +130,16 @@
   nux::StaticCairoText* _expand_label;
   IconTexture*          _expand_icon;
 
+  nux::BaseTexture* _background;
+  nux::BaseTexture* _background_nofilters;
+  bool              _using_nofilters_background;
+  std::unique_ptr<nux::AbstractPaintLayer> _background_layer;
+
   bool  _is_expanded;
   unsigned _n_visible_items_in_unexpand_mode;
   unsigned _n_total_items;
   unsigned _category_index;
   std::string _cached_name;
-  bool  _draw_sep;
   nux::Geometry _cached_geometry;
   
   std::string _renderer_name;
 
=== modified file 'dash/previews/ActionButton.cpp'
--- dash/previews/ActionButton.cpp	2012-08-28 08:30:00 +0000
+++ dash/previews/ActionButton.cpp	2012-09-13 15:55:51 +0000
@@ -29,7 +29,7 @@
 
 namespace
 {
-const int kMinButtonHeight = 36;
+const int kMinButtonHeight = 34;
 const int kMinButtonWidth  = 48;
 
 const int icon_size  = 24;
 
=== modified file 'dash/previews/PreviewContainer.cpp'
--- dash/previews/PreviewContainer.cpp	2012-09-04 10:45:31 +0000
+++ dash/previews/PreviewContainer.cpp	2012-09-13 15:55:51 +0000
@@ -62,6 +62,7 @@
   PreviewContent(PreviewContainer*const parent)
   : parent_(parent)
   , progress_(0.0)
+  , curve_progress_(0.0)
   , animating_(false)
   , waiting_preview_(false)
   , rotation_(0.0)
@@ -69,6 +70,11 @@
   , nav_complete_(0)
   , relative_nav_index_(0)
   {
+    OnGeometryChanged.connect([&](nux::Area*, nux::Geometry& geo)
+    {
+      // Need to update the preview geometries when updating the container geo.
+      UpdateAnimationProgress(progress_, curve_progress_);
+    });
     Style& style = previews::Style::Instance();
 
     spin_= style.GetSearchSpinIcon(256);
@@ -98,6 +104,9 @@
 
     if (preview)
     {
+      // the parents layout will not change based on the previews.
+      preview->SetReconfigureParentLayoutOnGeometryChange(false);
+      
       AddChild(preview.GetPointer());
       AddView(preview.GetPointer());
       preview->SetVisible(false);
@@ -123,6 +132,7 @@
   void UpdateAnimationProgress(float progress, float curve_progress)
   {
     progress_ = progress;
+    curve_progress_ = curve_progress;
 
     if (!animating_)
     {
@@ -171,39 +181,43 @@
 
     if (progress >= 1.0)
     {
-      animating_ = false;
-      if (current_preview_)
-      {
-        RemoveChild(current_preview_.GetPointer());
-        RemoveChildObject(current_preview_.GetPointer());
-        current_preview_.Release();
-      }
-      if (swipe_.preview)
-      {
-        if (swipe_.direction == Navigation::RIGHT)
-          relative_nav_index_++;
-        else if (swipe_.direction == Navigation::LEFT)
-          relative_nav_index_--;
-
-        current_preview_ = swipe_.preview;
-        swipe_.preview.Release();
+      // if we were animating, we need to remove the old preview, and replace it with the new.
+      if (animating_)
+      {
+        animating_ = false;
         if (current_preview_)
-          current_preview_->OnNavigateInComplete();
-      }
-
-      // another swipe?
-      if (!push_preview_.empty())
-      {
-        progress_ = 0;
-        continue_navigation.emit();
-      }
-      else
-      {
-        end_navigation.emit();
+        {
+          RemoveChild(current_preview_.GetPointer());
+          RemoveChildObject(current_preview_.GetPointer());
+          current_preview_.Release();
+        }
+        if (swipe_.preview)
+        {
+          if (swipe_.direction == Navigation::RIGHT)
+            relative_nav_index_++;
+          else if (swipe_.direction == Navigation::LEFT)
+            relative_nav_index_--;
+
+          current_preview_ = swipe_.preview;
+          swipe_.preview.Release();
+          if (current_preview_)
+            current_preview_->OnNavigateInComplete();
+        } 
+
+        // another swipe?
+        if (!push_preview_.empty())
+        {
+          progress_ = 0;
+          continue_navigation.emit();
+        }
+        else
+        {
+          end_navigation.emit();
+        }
       }
 
       // set the geometry to the whole layout.
-      if (current_preview_ && current_preview_->GetGeometry() != geometry)
+      if (current_preview_)
       {
         current_preview_->SetGeometry(geometry);
       }
@@ -309,7 +323,7 @@
       }
     }
 
-    _queued_draw = false;
+    //_queued_draw = false;
   }
 
   sigc::signal<void> start_navigation;
@@ -332,6 +346,7 @@
   PreviewSwipe swipe_;
 
   float progress_;
+  float curve_progress_;
   bool animating_;
   // wait animation
   glib::Source::UniquePtr preview_wait_timer_;
 
=== modified file 'launcher/LauncherController.cpp'
--- launcher/LauncherController.cpp	2012-09-04 16:40:30 +0000
+++ launcher/LauncherController.cpp	2012-09-13 15:55:51 +0000
@@ -244,7 +244,7 @@
 {
   static bool keynav_first_focus = false;
 
-  if (parent_->IsOverlayOpen())
+  if (parent_->IsOverlayOpen() || launcher_->GetParent()->GetInputWindowId() == xid)
     keynav_first_focus = false;
 
   if (keynav_first_focus)
 
=== modified file 'manual-tests/Dash.txt'
--- manual-tests/Dash.txt	2012-08-28 12:23:15 +0000
+++ manual-tests/Dash.txt	2012-09-13 15:55:51 +0000
@@ -100,6 +100,19 @@
  * When a single row of results isn't enough to contain all returned search results, and there are no other category headers, the displayed category
    header expands automatically
 
+
+Test the Panel does not lose track of when the Dash is opened then closed.
+--------------------------------------------------------------------------
+This tests shows the panel will not think the Dash is opened when it is closed.
+(see lp:1044086)
+
+Actions:
+#. Press Super twice (Quickly)
+
+Expected Result:
+  The screen should look the same as if you had never opened the dash.
+
+
 Filter Results Tests
 ========================
 These tests show that the dash "All" button works well.
 
=== modified file 'manual-tests/Preview.txt'
--- manual-tests/Preview.txt	2012-08-31 14:10:27 +0000
+++ manual-tests/Preview.txt	2012-09-13 15:55:51 +0000
@@ -5,7 +5,7 @@
 
 Setup:
 #. Open dash super
-#. Open a lens which supports previeing (eg Application, Music, File)
+#. Open a lens which supports previewing (e.g. Application, Music, File)
 #. Enter arbitrary search string and ensure a result is available.
 
 Actions:
@@ -23,7 +23,7 @@
 
 Setup:
 #. Open dash super
-#. Open a lens which supports previeing (eg Application, Music, File)
+#. Open a lens which supports previewing (e.g. Application, Music, File)
 #. Enter arbitrary search string and ensure at least 2 results are available.
 #. Right-click the mouse on at least the second result.
 #. Wait for the preview window to open and finish animating.
@@ -32,7 +32,7 @@
 #. Click the 'navigate left' icon.
 
 Expected Result:
-  The current preview will swipe out and the new prevew result will swipe from right
+  The current preview will swipe out and the new preview result will swipe from right
   to left using an ease in-out curve progression.
 
 
@@ -43,7 +43,7 @@
 
 Setup:
 #. Open dash super
-#. Open a lens which supports previeing (eg Application, Music, File)
+#. Open a lens which supports previewing (e.g. Application, Music, File)
 #. Enter arbitrary search string and ensure at least 2 results are available.
 #. Right-click the mouse on at most the second last result.
 #. Wait for the preview window to open and finish animating.
@@ -52,7 +52,7 @@
 #. Click the navigate right icon.
 
 Expected Result:
-  The current preview will swipe out and the new prevew result will swipe from right
+  The current preview will swipe out and the new preview result will swipe from right
   to left using an ease in-out curve progression.
 
 
@@ -111,7 +111,7 @@
 Expected Result:
   When hovering on play icon, it will change to a pause icon.
   Music Player daemon will pause the playing track and update it's status
-  to paused. Progress will stop incresing.
+  to paused. Progress will stop increasing.
 
 
 Preview Application Launch
@@ -130,3 +130,24 @@
 
 Expected Result:
   Preview should close and launch the gedit application.
+
+
+Preview Open Geometry
+------------
+This tests the dash preview opens with the correct size and
+its geometry is updated when changing between form factor (desktop & netbook)
+
+Setup:
+#. Open dash super
+#. Ensure dash is in windowed mode (not full screen)
+#. Open a lens which supports previewing (e.g. Application, Music, File)
+#. Enter arbitrary search string and ensure a result is available.
+
+Actions:
+#. Open preview for result.
+#. Resize dash to full screen.
+#. Resize dash back to windowed mode.
+
+Expected Result:
+  A preview will open with the correct size initially (no size flicker).
+  When the dash is resized, the preview will center its geometry and stay the correct size.
 
=== modified file 'panel/PanelController.cpp'
--- panel/PanelController.cpp	2012-07-23 21:50:30 +0000
+++ panel/PanelController.cpp	2012-09-13 15:55:51 +0000
@@ -53,6 +53,7 @@
   std::vector<nux::Geometry> GetGeometries() const;
 
   // NOTE: nux::Property maybe?
+  void SetLauncherWidth(int width);
   void SetOpacity(float opacity);
   void SetOpacityMaximizedToggle(bool enabled);
 
@@ -147,6 +148,14 @@
   }
 }
 
+void Controller::Impl::SetLauncherWidth(int width)
+{
+  for (auto window: windows_)
+  {
+    ViewForWindow(window)->SetLauncherWidth(width);
+  }
+}
+
 void Controller::Impl::SetOpacityMaximizedToggle(bool enabled)
 {
   opacity_maximized_toggle_ = enabled;
@@ -297,6 +306,11 @@
   UScreen* screen = UScreen::GetDefault();
   screen->changed.connect(sigc::mem_fun(this, &Controller::OnScreenChanged));
   OnScreenChanged(screen->GetPrimaryMonitor(), screen->GetMonitors());
+
+  launcher_width.changed.connect([&] (int width)
+  {
+    pimpl->SetLauncherWidth(width);
+  });
 }
 
 Controller::~Controller()
 
=== modified file 'panel/PanelController.h'
--- panel/PanelController.h	2012-06-19 08:52:39 +0000
+++ panel/PanelController.h	2012-09-13 15:55:51 +0000
@@ -44,6 +44,8 @@
   std::vector<nux::View*> GetPanelViews() const;
   std::vector<nux::Geometry> GetGeometries() const;
 
+  nux::Property<int> launcher_width;
+
   // NOTE: nux::Property maybe?
   void SetOpacity(float opacity);
   void SetOpacityMaximizedToggle(bool enabled);
 
=== modified file 'panel/PanelView.cpp'
--- panel/PanelView.cpp	2012-07-26 09:56:17 +0000
+++ panel/PanelView.cpp	2012-09-13 15:55:51 +0000
@@ -44,7 +44,8 @@
 
 namespace
 {
-nux::logging::Logger logger("unity.PanelView");
+nux::logging::Logger logger("unity.panel.view");
+const int refine_gradient_midpoint = 959;
 }
 
 namespace unity
@@ -61,6 +62,8 @@
   , _overlay_is_open(false)
   , _opacity(1.0f)
   , _monitor(0)
+  , _stored_dash_width(0)
+  , _launcher_width(0)
 {
   panel::Style::Instance().changed.connect(sigc::mem_fun(this, &PanelView::ForceUpdateBackground));
 
@@ -98,7 +101,47 @@
   _ubus_manager.RegisterInterest(UBUS_BACKGROUND_COLOR_CHANGED, sigc::mem_fun(this, &PanelView::OnBackgroundUpdate));
   _ubus_manager.RegisterInterest(UBUS_OVERLAY_HIDDEN, sigc::mem_fun(this, &PanelView::OnOverlayHidden));
   _ubus_manager.RegisterInterest(UBUS_OVERLAY_SHOWN, sigc::mem_fun(this, &PanelView::OnOverlayShown));
-
+  _ubus_manager.RegisterInterest(UBUS_DASH_SIZE_CHANGED, [&] (GVariant *data)
+  {
+    int width, height;
+    g_variant_get(data, "(ii)", &width, &height);
+    _stored_dash_width = width;
+    QueueDraw();
+  });
+  
+  _ubus_manager.RegisterInterest(UBUS_REFINE_STATUS, [this] (GVariant *data) 
+  {
+    gboolean status;
+    g_variant_get(data, UBUS_REFINE_STATUS_FORMAT_STRING, &status);
+
+    _refine_is_open = status;
+  
+    nux::ROPConfig rop;
+    rop.Blend = true;
+    rop.SrcBlend = GL_ONE;
+    rop.DstBlend = GL_ONE_MINUS_SRC_ALPHA;
+
+    nux::TexCoordXForm texxform;
+    if (_refine_is_open)
+    {
+      _bg_refine_layer.reset(new nux::TextureLayer(_bg_refine_tex->GetDeviceTexture(), 
+                             texxform, 
+                             nux::color::White,
+                             false,
+                             rop));
+    }
+    else
+    {
+      _bg_refine_layer.reset(new nux::TextureLayer(_bg_refine_no_refine_tex->GetDeviceTexture(), 
+                             texxform, 
+                             nux::color::White,
+                             false,
+                             rop));
+      
+    }
+    QueueDraw();
+  });
+  
   // request the latest colour from bghash
   _ubus_manager.SendMessage(UBUS_BACKGROUND_REQUEST_COLOUR_EMIT);
 
@@ -116,6 +159,61 @@
   {
     _panel_sheen.Adopt(nux::CreateTexture2DFromPixbuf(pixbuf, true));
   }
+
+  //FIXME (gord) like 12 months later, still not async loading! 
+  pixbuf = gdk_pixbuf_new_from_file(PKGDATADIR "/refine_gradient_panel.png", &error);
+  if (error)
+  {
+    LOG_WARN(logger) << "Unable to texture " << PKGDATADIR << "/refine_gradient_panel.png";
+  }
+  else
+  {
+    _bg_refine_tex.Adopt(nux::CreateTexture2DFromPixbuf(pixbuf, true));
+  }
+
+  //FIXME (gord) like 12 months later, still not async loading! 
+  pixbuf = gdk_pixbuf_new_from_file(PKGDATADIR "/refine_gradient_panel_no_refine.png", &error);
+  if (error)
+  {
+    LOG_WARN(logger) << "Unable to texture " << PKGDATADIR << "/refine_gradient_panel_no_refine.png";
+  }
+  else
+  {
+    _bg_refine_no_refine_tex.Adopt(nux::CreateTexture2DFromPixbuf(pixbuf, true));
+  }
+
+  rop.Blend = true;
+  rop.SrcBlend = GL_ONE;
+  rop.DstBlend = GL_ONE_MINUS_SRC_ALPHA;
+
+  nux::TexCoordXForm texxform;
+  _bg_refine_layer.reset(new nux::TextureLayer(_bg_refine_tex->GetDeviceTexture(), 
+                         texxform, 
+                         nux::color::White,
+                         false,
+                         rop));
+
+  //FIXME (gord) like 12 months later, still not async loading! 
+  pixbuf = gdk_pixbuf_new_from_file(PKGDATADIR "/refine_gradient_panel_single_column.png", &error);
+  if (error)
+  {
+    LOG_WARN(logger) << "Unable to texture " << PKGDATADIR << "/refine_gradient_panel_single_column.png";
+  }
+  else
+  {
+    _bg_refine_single_column_tex.Adopt(nux::CreateTexture2DFromPixbuf(pixbuf, true));
+  }
+
+  rop.Blend = true;
+  rop.SrcBlend = GL_ONE;
+  rop.DstBlend = GL_ONE_MINUS_SRC_ALPHA;
+
+  _bg_refine_single_column_layer.reset(new nux::TextureLayer(_bg_refine_single_column_tex->GetDeviceTexture(), 
+                         texxform, 
+                         nux::color::White,
+                         false,
+                         rop));
+
 }
 
 PanelView::~PanelView()
@@ -138,6 +236,12 @@
   return _tray->xid();
 }
 
+void PanelView::SetLauncherWidth(int width)
+{
+  _launcher_width = width;
+  QueueDraw();
+}
+
 void PanelView::OnBackgroundUpdate(GVariant *data)
 {
   gdouble red, green, blue, alpha;
@@ -219,6 +323,7 @@
 void
 PanelView::Draw(nux::GraphicsEngine& GfxContext, bool force_draw)
 {
+  LOG_DEBUG(logger) << "test";
   nux::Geometry const& geo = GetGeometry();
   UpdateBackground();
 
@@ -285,6 +390,28 @@
     if (_overlay_is_open)
     {
       nux::GetPainter().RenderSinglePaintLayer(GfxContext, geo, _bg_darken_layer.get());
+    
+      GfxContext.GetRenderStates().SetBlend(true, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
+      nux::TexCoordXForm refine_texxform;
+      
+      int refine_x_pos = geo.x + (_stored_dash_width - refine_gradient_midpoint);
+
+      refine_x_pos += _launcher_width;
+      GfxContext.QRP_1Tex(refine_x_pos, 
+                          geo.y,
+                          _bg_refine_tex->GetWidth(), 
+                          _bg_refine_tex->GetHeight(),
+                          _bg_refine_tex->GetDeviceTexture(),
+                          refine_texxform,
+                          nux::color::White);
+      
+      GfxContext.QRP_1Tex(refine_x_pos + _bg_refine_tex->GetWidth(),
+                          geo.y,
+                          geo.width,
+                          geo.height,
+                          _bg_refine_single_column_tex->GetDeviceTexture(),
+                          refine_texxform,
+                          nux::color::White);
     }
   }
 
@@ -360,6 +487,24 @@
     {
       nux::GetPainter().PushLayer(GfxContext, geo, _bg_darken_layer.get());
       bgs++;
+      
+      nux::Geometry refine_geo = geo;
+      
+      int refine_x_pos = geo.x + (_stored_dash_width - refine_gradient_midpoint);
+      refine_x_pos += _launcher_width;
+      
+      refine_geo.x = refine_x_pos;
+      refine_geo.width = _bg_refine_tex->GetWidth();
+      refine_geo.height = _bg_refine_tex->GetHeight();
+
+      nux::GetPainter().PushLayer(GfxContext, refine_geo, _bg_refine_layer.get());
+      bgs++;
+
+      refine_geo.x += refine_geo.width;
+      refine_geo.width = geo.width;
+      refine_geo.height = geo.height;
+      nux::GetPainter().PushLayer(GfxContext, refine_geo, _bg_refine_single_column_layer.get());
+      bgs++;
     }
   }
 
 
=== modified file 'panel/PanelView.h'
--- panel/PanelView.h	2012-07-04 02:37:23 +0000
+++ panel/PanelView.h	2012-09-13 15:55:51 +0000
@@ -64,6 +64,8 @@
 
   Window GetTrayXid() const;
 
+  void SetLauncherWidth(int width);
+
 protected:
   void Draw(nux::GraphicsEngine& GfxContext, bool force_draw);
   void DrawContent(nux::GraphicsEngine& GfxContext, bool force_draw);
@@ -105,6 +107,12 @@
   nux::ObjectPtr<nux::BaseTexture> _panel_sheen;
   nux::HLayout* _layout;
 
+  nux::ObjectPtr <nux::BaseTexture> _bg_refine_tex;
+  nux::ObjectPtr <nux::BaseTexture> _bg_refine_no_refine_tex;
+  
+  std::unique_ptr<nux::AbstractPaintLayer> _bg_refine_layer;
+  nux::ObjectPtr <nux::BaseTexture> _bg_refine_single_column_tex;
+  std::unique_ptr<nux::AbstractPaintLayer> _bg_refine_single_column_layer;
   nux::Geometry _last_geo;
 
   nux::Color  _bg_color;
@@ -115,6 +123,9 @@
   bool        _overlay_is_open;
   float       _opacity;
   int         _monitor;
+  int         _stored_dash_width;
+  int         _launcher_width;
+  bool        _refine_is_open;
 
   std::string _active_overlay;
 
 
=== modified file 'panel/StandalonePanel.cpp'
--- panel/StandalonePanel.cpp	2012-08-15 02:51:33 +0000
+++ panel/StandalonePanel.cpp	2012-09-13 15:55:51 +0000
@@ -18,11 +18,12 @@
  *
  */
 
-#include "Nux/Nux.h"
-#include "Nux/VLayout.h"
-#include "Nux/HLayout.h"
-#include "Nux/WindowThread.h"
-#include "NuxGraphics/GraphicsEngine.h"
+#include <Nux/Nux.h>
+#include <Nux/VLayout.h>
+#include <Nux/HLayout.h>
+#include <Nux/WindowThread.h>
+#include <NuxGraphics/GraphicsEngine.h>
+#include <NuxCore/Logger.h>
 #include <gtk/gtk.h>
 
 #include "unity-shared/UnitySettings.h"
@@ -47,7 +48,8 @@
   g_type_init();
   gtk_init(&argc, &argv);
   nux::NuxInitialize(0);
-
+  nux::logging::configure_logging(::getenv("UNITY_LOG_SEVERITY"));
+  
   // The instances for the pseudo-singletons.
   unity::Settings settings;
   unity::panel::Style panel_style;
 
=== added file 'plugins/unityshell/resources/category_gradient.png'
 Binary files plugins/unityshell/resources/category_gradient.png	1970-01-01 00:00:00 +0000 and plugins/unityshell/resources/category_gradient.png	2012-09-13 15:55:51 +0000 differ
=== added file 'plugins/unityshell/resources/category_gradient_no_refine.png'
 Binary files plugins/unityshell/resources/category_gradient_no_refine.png	1970-01-01 00:00:00 +0000 and plugins/unityshell/resources/category_gradient_no_refine.png	2012-09-13 15:55:51 +0000 differ
=== modified file 'plugins/unityshell/resources/lens-nav-app.svg'
--- plugins/unityshell/resources/lens-nav-app.svg	2011-06-30 17:24:25 +0000
+++ plugins/unityshell/resources/lens-nav-app.svg	2012-09-13 15:55:51 +0000
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
+<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 width="24px" height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
-<g>
-	<g>
-		<path fill="#FFFFFF" d="M9.5,21c0,0.55,0.45,1,1,1h3c0.55,0,1-0.45,1-1V8h-5V21z M6.5,2H3.501c-0.55,0-1,0.45-1,1L2.5,21
-			c0,0.55,0.45,1,1,1h2.999c0.55,0,1-0.45,1-1v-2.969H5.5v-1h1.999V14H5.5v-1h2v-3h-2V9h2V6h-2V5h2V3C7.5,2.45,7.05,2,6.5,2z
-			 M7.5,10V9V10L7.5,10z M7.5,14v-1h0L7.5,14L7.5,14z M7.5,18.031v-1H7.499L7.5,18.031L7.5,18.031z M19,8.015
-			c1.104,0,2.5-1.119,2.5-2.5c0-0.933-1.408-2.79-2-3.515v1.515c0.293,0.174,0.5,0.48,0.5,0.847c0,0.553-0.447,1-1,1s-1-0.447-1-1
-			c0-0.366,0.207-0.673,0.5-0.847V2c-0.592,0.725-2,2.582-2,3.515C16.5,6.896,17.896,8.015,19,8.015z M9.438,7H14.5l-2.531-5
-			L9.438,7z M16.5,21c0,0.55,0.45,1,1,1h3c0.55,0,1-0.45,1-1V9h-5V21z"/>
-	</g>
-</g>
+<path fill="#FFFFFF" d="M14,8v12c0,0.55-0.45,1-1,1h-2c-0.55,0-1-0.45-1-1V8H14z"/>
+<path fill="#FFFFFF" d="M8,11H6v-1h2V8H6V7h2V4c0-0.55-0.45-1-1-1H5.001c-0.55,0-1,0.45-1,1L4,20c0,0.55,0.45,1,1,1h2
+	c0.55,0,1-0.45,1-1v-3H6v-1h2v-2H6v-1h2V11z"/>
+<path fill="#FFFFFF" d="M8,8L8,8V7l0,0V8z"/>
+<path fill="#FFFFFF" d="M18.366,3v1.542C18.602,4.681,18.8,4.925,18.8,5.217c0,0.441-0.358,0.799-0.8,0.799s-0.8-0.358-0.8-0.799
+	c0-0.292,0.198-0.537,0.433-0.675V3C17.16,3.578,16,5.26,16,6.005C16,7.106,17.116,8,18,8s2-0.894,2-1.995
+	C20,5.26,18.84,3.578,18.366,3z"/>
+<path fill="#FFFFFF" d="M20,9v11c0,0.55-0.45,1-1,1h-2c-0.55,0-1-0.45-1-1V9H20z"/>
+<path fill="#FFFFFF" d="M12.552,3.991c0.191,0.349,0.378,0.7,0.56,1.056c0.182,0.355,0.349,0.701,0.502,1.038
+	C13.766,6.42,13.895,6.726,14,7h-4c0.105-0.262,0.234-0.561,0.387-0.897c0.153-0.336,0.318-0.682,0.495-1.038
+	c0.177-0.354,0.36-0.71,0.552-1.065c0.191-0.355,0.377-0.688,0.559-1C12.175,3.312,12.36,3.642,12.552,3.991z"/>
 </svg>
-
 \ No newline at end of file
 
=== modified file 'plugins/unityshell/resources/lens-nav-file.svg'
--- plugins/unityshell/resources/lens-nav-file.svg	2011-06-30 17:24:25 +0000
+++ plugins/unityshell/resources/lens-nav-file.svg	2012-09-13 15:55:51 +0000
@@ -1,13 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
+<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 width="24px" height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
-<g>
-	<g>
-		<path fill="#FFFFFF" d="M14.969,2H14v6h6V7L14.969,2z M13,2H5C4.45,2,4,2.45,4,3v18c0,0.55,0.45,1,1,1h14c0.551,0,1-0.45,1-1
-			V9.007h-7V2z"/>
-	</g>
-</g>
+<path fill="#FFFFFF" d="M15,3v4h4V6l-3.031-3H15z"/>
+<path fill="#FFFFFF" d="M18,21H6c-0.55,0-1-0.45-1-1V4c0-0.55,0.45-1,1-1h8v5.007h5V20C19,20.55,18.551,21,18,21z"/>
 </svg>
-
 \ No newline at end of file
 
=== added file 'plugins/unityshell/resources/lens-nav-gwibber.svg'
--- plugins/unityshell/resources/lens-nav-gwibber.svg	1970-01-01 00:00:00 +0000
+++ plugins/unityshell/resources/lens-nav-gwibber.svg	2012-09-13 15:55:51 +0000
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="24px" height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<path fill="#FFFFFF" d="M23,11.38c-0.774,0.14-1.897-0.005-2.492-0.267c1.236-0.108,2.073-0.701,2.396-1.505
+	c-0.445,0.29-1.829,0.604-2.593,0.304c-0.038-0.189-0.078-0.369-0.121-0.533c-0.581-2.256-2.576-4.074-4.663-3.854
+	c0.169-0.073,0.34-0.139,0.512-0.2c0.229-0.087,1.577-0.318,1.365-0.82c-0.179-0.442-1.828,0.332-2.138,0.435
+	c0.41-0.162,1.087-0.441,1.159-0.939c-0.627,0.091-1.243,0.404-1.72,0.86c0.173-0.195,0.304-0.432,0.331-0.689
+	c-1.675,1.129-2.652,3.405-3.443,5.613c-0.621-0.637-1.173-1.136-1.667-1.416C8.541,7.584,6.883,6.766,4.282,5.746
+	c-0.08,0.909,0.426,2.118,1.881,2.92C5.848,8.621,5.271,8.722,4.811,8.838c0.188,1.042,0.801,1.899,2.463,2.312
+	c-0.759,0.053-1.153,0.237-1.508,0.629c0.346,0.725,1.191,1.576,2.708,1.401c-1.689,0.769-0.688,2.19,0.686,1.979
+	C6.817,17.715,3.122,17.525,1,15.39c5.539,7.969,17.581,4.712,19.374-2.963C21.721,12.438,22.51,11.936,23,11.38z"/>
+</svg>
 
=== modified file 'plugins/unityshell/resources/lens-nav-home.svg'
--- plugins/unityshell/resources/lens-nav-home.svg	2011-06-30 17:24:25 +0000
+++ plugins/unityshell/resources/lens-nav-home.svg	2012-09-13 15:55:51 +0000
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
+<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 width="24px" height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
-<path fill="#FFFFFF" d="M12.707,2.298C12.513,2.1,12.256,2,12,2s-0.513,0.1-0.707,0.298L2,11.788h2v9.191C4,21.539,4.45,22,5,22
-	h5.02v-6.127h3.968V22H19c0.55,0,1-0.461,1-1.021v-9.191h2L12.707,2.298z"/>
+<path fill-rule="evenodd" clip-rule="evenodd" fill="#FFFFFF" d="M12.678,3.268C12.5,3.089,12.266,3,12.031,3
+	c-0.235,0-0.47,0.089-0.647,0.268L3,12h2v8c0,0.553,0.447,1,1,1h12c0.553,0,1-0.447,1-1v-8h2L12.678,3.268z M14,20.998h-4v-5h4
+	V20.998z"/>
 </svg>
-
 \ No newline at end of file
 
=== modified file 'plugins/unityshell/resources/lens-nav-music.svg'
--- plugins/unityshell/resources/lens-nav-music.svg	2011-06-30 17:24:25 +0000
+++ plugins/unityshell/resources/lens-nav-music.svg	2012-09-13 15:55:51 +0000
@@ -1,16 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
+<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 width="24px" height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
-<g>
-	<g>
-		<path fill="#FFFFFF" d="M21,2.85c0-0.55-0.443-0.927-0.986-0.837L9.986,3.687C9.444,3.776,9,4.301,9,4.851v10.268l0.02,0.026
-			c-1.062-0.301-2.393-0.131-3.61,0.578c-2.025,1.178-2.956,3.379-2.079,4.911s3.232,1.819,5.258,0.637
-			c1.437-0.835,2.307-2.182,2.389-3.441l0.022,0.03V7.155c0-0.55,0.444-1.075,0.986-1.165l6.028-1.006
-			C18.557,4.894,19,5.271,19,5.821v7.296l0.02,0.026c-1.062-0.3-2.393-0.131-3.609,0.578c-2.025,1.179-2.957,3.379-2.079,4.911
-			c0.877,1.533,3.231,1.82,5.257,0.638c1.438-0.835,2.308-2.183,2.39-3.442L21,15.859V2.85z"/>
-	</g>
-</g>
+<path fill="#FFFFFF" d="M19.964,14.964L20,15V3.849c0-0.55-0.444-0.926-0.986-0.835l-8.027,1.67C10.444,4.774,10,5.299,10,5.849
+	v9.603c-0.984-0.633-2.52-0.61-3.892,0.172c-1.772,1.009-2.587,2.895-1.819,4.207c0.767,1.312,2.828,1.559,4.6,0.545
+	c1.441-0.819,2.232-2.213,2.074-3.412L11,17V6.849c0-0.55,0.444-1.075,0.986-1.167l6.028-1.365C18.557,4.224,19,4.599,19,5.148
+	v8.302c-0.984-0.632-2.521-0.609-3.891,0.174c-1.773,1.01-2.588,2.894-1.82,4.206c0.768,1.312,2.828,1.56,4.601,0.546
+	C19.331,17.557,20.122,16.163,19.964,14.964z"/>
 </svg>
-
 \ No newline at end of file
 
=== modified file 'plugins/unityshell/resources/lens-nav-photo.svg'
--- plugins/unityshell/resources/lens-nav-photo.svg	2011-06-30 17:24:25 +0000
+++ plugins/unityshell/resources/lens-nav-photo.svg	2012-09-13 15:55:51 +0000
@@ -1,16 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
+<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 width="24px" height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
-<g>
-	<g>
-		<path fill="#FFFFFF" d="M12.009,9.51c-2.218,0-4.016,1.797-4.016,4.013s1.798,4.013,4.016,4.013s4.016-1.797,4.016-4.013
-			S14.227,9.51,12.009,9.51z M21,6.511H3c-0.55,0-1,0.45-1,0.999v11.991c0,0.55,0.45,0.999,1,0.999h18c0.55,0,1-0.449,1-0.999V7.51
-			C22,6.961,21.55,6.511,21,6.511z M12,19.501c-3.313,0-6-2.684-6-5.995c0-3.312,2.687-5.996,6-5.996s6,2.684,6,5.996
-			C18,16.817,15.313,19.501,12,19.501z M15.664,5.55l-0.368-1.102C15.122,3.927,14.53,3.5,13.979,3.5h-4
-			c-0.55,0-1.142,0.427-1.316,0.948L8.296,5.55C8.122,6.071,7.53,6.498,6.98,6.498h10C16.431,6.498,15.838,6.071,15.664,5.55z"/>
-	</g>
-</g>
+<path fill="#FFFFFF" d="M16,13.5c0,2.21-1.79,4-4,4s-4-1.79-4-4s1.79-4,4-4S16,11.29,16,13.5z"/>
+<path fill="#FFFFFF" d="M20,7.5h-3c-0.55,0-1.162-0.433-1.336-0.956l-0.368-1.103C15.122,4.92,14.55,4.5,14,4.5h-4
+	c-0.55,0-1.162,0.42-1.337,0.942L8.296,6.544C8.122,7.067,7.55,7.5,7,7.5H4c-0.55,0-1,0.45-1,1v10c0,0.551,0.45,1,1,1h16
+	c0.55,0,1-0.449,1-1v-10C21,7.95,20.55,7.5,20,7.5z M12,18.5c-2.762,0-5-2.238-5-5c0-2.763,2.238-5,5-5c2.761,0,5,2.237,5,5
+	C17,16.262,14.761,18.5,12,18.5z"/>
 </svg>
-
 \ No newline at end of file
 
=== modified file 'plugins/unityshell/resources/lens-nav-video.svg'
--- plugins/unityshell/resources/lens-nav-video.svg	2011-06-30 17:24:25 +0000
+++ plugins/unityshell/resources/lens-nav-video.svg	2012-09-13 15:55:51 +0000
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
+<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 width="24px" height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
-<g>
-	<g>
-		<path fill="#FFFFFF" d="M21,4H3C2.45,4,2,4.45,2,5v14c0,0.55,0.45,1,1,1h18c0.55,0,1-0.45,1-1V5C22,4.45,21.55,4,21,4z M5,19H3v-2
-			h2V19z M5,16H3v-2h2V16z M5,13H3v-2h2V13z M5,10H3V8h2V10z M5,7H3V5h2V7z M9,15.98V8l7.036,4L9,15.98z M21,19h-2v-2h2V19z M21,16
-			h-2v-2h2V16z M21,13h-2v-2h2V13z M21,10h-2V8h2V10z M21,7h-2V5h2V7z"/>
-	</g>
-</g>
+<path fill="#FFFFFF" d="M20,4.5H4c-0.532,0-1,0.467-1,1v13c0,0.533,0.468,1,1,1h16c0.533,0,1-0.467,1-1v-13
+	C21,4.967,20.533,4.5,20,4.5z M5.5,18.5h-1v-1h1V18.5z M5.5,16.5h-1v-1h1V16.5z M5.5,14.5h-1v-1h1V14.5z M5.5,12.5h-1v-1h1V12.5z
+	 M5.5,10.5h-1v-1h1V10.5z M5.5,8.5h-1v-1h1V8.5z M5.5,6.5h-1v-1h1V6.5z M14.267,13.241c-0.61,0.431-1.226,0.85-1.849,1.259
+	c-0.621,0.408-1.226,0.785-1.815,1.129C10.015,15.973,9.479,16.263,9,16.5v-9c0.458,0.236,0.981,0.527,1.57,0.871
+	c0.588,0.343,1.194,0.715,1.816,1.113c0.621,0.398,1.243,0.812,1.864,1.242c0.622,0.429,1.205,0.849,1.75,1.257
+	C15.455,12.392,14.877,12.812,14.267,13.241z M19.5,18.5h-1v-1h1V18.5z M19.5,16.5h-1v-1h1V16.5z M19.5,14.5h-1v-1h1V14.5z
+	 M19.5,12.5h-1v-1h1V12.5z M19.5,10.5h-1v-1h1V10.5z M19.5,8.5h-1v-1h1V8.5z M19.5,6.5h-1v-1h1V6.5z"/>
 </svg>
-
 \ No newline at end of file
 
=== added file 'plugins/unityshell/resources/refine_gradient.png'
 Binary files plugins/unityshell/resources/refine_gradient.png	1970-01-01 00:00:00 +0000 and plugins/unityshell/resources/refine_gradient.png	2012-09-13 15:55:51 +0000 differ
=== added file 'plugins/unityshell/resources/refine_gradient_corner.png'
 Binary files plugins/unityshell/resources/refine_gradient_corner.png	1970-01-01 00:00:00 +0000 and plugins/unityshell/resources/refine_gradient_corner.png	2012-09-13 15:55:51 +0000 differ
=== added file 'plugins/unityshell/resources/refine_gradient_dash.png'
 Binary files plugins/unityshell/resources/refine_gradient_dash.png	1970-01-01 00:00:00 +0000 and plugins/unityshell/resources/refine_gradient_dash.png	2012-09-13 15:55:51 +0000 differ
=== added file 'plugins/unityshell/resources/refine_gradient_dash_no_refine.png'
 Binary files plugins/unityshell/resources/refine_gradient_dash_no_refine.png	1970-01-01 00:00:00 +0000 and plugins/unityshell/resources/refine_gradient_dash_no_refine.png	2012-09-13 15:55:51 +0000 differ
=== added file 'plugins/unityshell/resources/refine_gradient_no_refine_dash.png'
 Binary files plugins/unityshell/resources/refine_gradient_no_refine_dash.png	1970-01-01 00:00:00 +0000 and plugins/unityshell/resources/refine_gradient_no_refine_dash.png	2012-09-13 15:55:51 +0000 differ
=== added file 'plugins/unityshell/resources/refine_gradient_panel.png'
 Binary files plugins/unityshell/resources/refine_gradient_panel.png	1970-01-01 00:00:00 +0000 and plugins/unityshell/resources/refine_gradient_panel.png	2012-09-13 15:55:51 +0000 differ
=== added file 'plugins/unityshell/resources/refine_gradient_panel_single_column.png'
 Binary files plugins/unityshell/resources/refine_gradient_panel_single_column.png	1970-01-01 00:00:00 +0000 and plugins/unityshell/resources/refine_gradient_panel_single_column.png	2012-09-13 15:55:51 +0000 differ
=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2012-09-07 12:40:24 +0000
+++ plugins/unityshell/src/unityshell.cpp	2012-09-13 15:55:51 +0000
@@ -131,7 +131,6 @@
   , panel_texture_has_changed_(true)
   , paint_panel_(false)
   , scale_just_activated_(false)
-  , scale_highlighted_window_(0)
   , minimize_speed_controller(new WindowMinimizeSpeedController())
 {
   Timer timer;
@@ -359,7 +358,7 @@
        g_variant_get(data, UBUS_OVERLAY_FORMAT_STRING,
                     &overlay_identity, &can_maximise, &overlay_monitor);
 
-       dash_monitor_ = overlay_monitor;
+       overlay_monitor_ = overlay_monitor;
 
        RaiseInputWindows();
      });
@@ -370,7 +369,6 @@
   }
 
   panel::Style::Instance().changed.connect(sigc::mem_fun(this, &UnityScreen::OnPanelStyleChanged));
-  WindowManager::Default()->terminate_spread.connect([this] { scale_highlighted_window_ = 0; });
 
   minimize_speed_controller->DurationChanged.connect(
       sigc::mem_fun(this, &UnityScreen::OnMinimizeDurationChanged)
@@ -571,7 +569,7 @@
     i++;
   }
 
-  if (!(launcher_controller_->IsOverlayOpen() && current_monitor == dash_monitor_)
+  if (!(launcher_controller_->IsOverlayOpen() && current_monitor == overlay_monitor_)
       && panel_controller_->opacity() > 0.0f)
   {
     foreach(GLTexture * tex, _shadow_texture)
@@ -1379,14 +1377,17 @@
 void UnityScreen::handleEvent(XEvent* event)
 {
   bool skip_other_plugins = false;
+  auto wm = PluginAdapter::Default();
+
   switch (event->type)
   {
     case FocusIn:
     case FocusOut:
       if (event->xfocus.mode == NotifyGrab)
-        PluginAdapter::Default()->OnScreenGrabbed();
+        wm->OnScreenGrabbed();
       else if (event->xfocus.mode == NotifyUngrab)
-        PluginAdapter::Default()->OnScreenUngrabbed();
+        wm->OnScreenUngrabbed();
+
       if (_key_nav_mode_requested)
       {
         // Close any overlay that is open.
@@ -1400,9 +1401,10 @@
       _key_nav_mode_requested = false;
       break;
     case MotionNotify:
-      if (scale_highlighted_window_ && PluginAdapter::Default()->IsScaleActive())
+      if (wm->IsScaleActive())
       {
-        if (CompWindow *w = screen->findWindow(scale_highlighted_window_))
+        ScaleScreen* ss = ScaleScreen::get(screen);
+        if (CompWindow *w = screen->findWindow(ss->getSelectedWindow()))
           skip_other_plugins = UnityWindow::get(w)->handleEvent(event);
       }
       break;
@@ -1412,12 +1414,21 @@
         launcher_controller_->KeyNavTerminate(false);
         EnableCancelAction(CancelActionTarget::LAUNCHER_SWITCHER, false);
       }
-      if (scale_highlighted_window_ && PluginAdapter::Default()->IsScaleActive())
+      if (wm->IsScaleActive())
       {
-        if (CompWindow *w = screen->findWindow(scale_highlighted_window_))
+        ScaleScreen* ss = ScaleScreen::get(screen);
+        if (CompWindow *w = screen->findWindow(ss->getSelectedWindow()))
           skip_other_plugins = UnityWindow::get(w)->handleEvent(event);
       }
-
+      if (launcher_controller_->IsOverlayOpen())
+      {
+        int monitor_with_mouse = UScreen::GetDefault()->GetMonitorWithMouse();
+        if (overlay_monitor_ != monitor_with_mouse)
+        {
+          dash_controller_->HideDash(false);
+          hud_controller_->HideHud(false);
+        }
+      }
       break;
     case ButtonRelease:
       if (switcher_controller_ && switcher_controller_->Visible())
@@ -1437,10 +1448,11 @@
           }
         }
       }
-      else if (scale_highlighted_window_ && PluginAdapter::Default()->IsScaleActive())
+      else if (wm->IsScaleActive())
       {
-        if (CompWindow *w = screen->findWindow(scale_highlighted_window_))
-          UnityWindow::get(w)->handleEvent(event);
+        ScaleScreen* ss = ScaleScreen::get(screen);
+        if (CompWindow *w = screen->findWindow(ss->getSelectedWindow()))
+          skip_other_plugins = UnityWindow::get(w)->handleEvent(event);
       }
       break;
     case KeyPress:
@@ -2556,7 +2568,8 @@
     UnityScreen* us = UnityScreen::get(screen);
     CompWindow *lw;
 
-    if (us->launcher_controller_->IsOverlayOpen())
+    // can't rely on launcher->IsOverlayVisible on focus change (because ubus is async close on focus change.)
+    if (us && (us->dash_controller_->IsVisible() || us->hud_controller_->IsVisible()))
     {
       lw = screen->findWindow(us->launcher_controller_->LauncherWindowId(0));
       lw->moveInputFocusTo();
@@ -2770,6 +2783,7 @@
        * that must not be considered when drawing an overlay */
       hud_controller_->launcher_width = launcher_controller_->launcher().GetAbsoluteWidth() - 1;
       dash_controller_->launcher_width = launcher_controller_->launcher().GetAbsoluteWidth() - 1;
+      panel_controller_->launcher_width = launcher_controller_->launcher().GetAbsoluteWidth() - 1;
 
       if (p)
       {
@@ -3597,8 +3611,8 @@
   if (!scale_win->hasSlot()) // animation not finished
     return;
 
-  UnityScreen* us = UnityScreen::get(screen);
-  const bool highlighted = (us->scale_highlighted_window_ == window->id());
+  ScaleScreen* ss = ScaleScreen::get(screen);
+  const bool highlighted = (ss->getSelectedWindow() == window->id());
 
   ScalePosition const& pos = scale_win->getCurrentPosition();
   auto const& border_rect = window->borderRect();
@@ -3651,16 +3665,6 @@
   }
 }
 
-void UnityWindow::scaleSelectWindow()
-{
-  ScaleWindow::get(window)->scaleSelectWindow();
-
-  UnityScreen* us = UnityScreen::get(screen);
-
-  if (us->scale_highlighted_window_ != window->id())
-    us->scale_highlighted_window_ = window->id();
-}
-
 void UnityWindow::OnInitiateSpreed()
 {
   auto const windows = screen->windows();
 
=== modified file 'plugins/unityshell/src/unityshell.h'
--- plugins/unityshell/src/unityshell.h	2012-09-07 12:40:24 +0000
+++ plugins/unityshell/src/unityshell.h	2012-09-13 15:55:51 +0000
@@ -312,7 +312,7 @@
 
   bool   queryForShader ();
 
-  int dash_monitor_;
+  int overlay_monitor_;
   CompScreen::GrabHandle grab_index_;
   CompWindowList         fullscreen_windows_;
   bool                   painting_tray_;
@@ -333,8 +333,6 @@
   glib::SourceManager sources_;
   unity::ThumbnailGenerator thumb_generator;
 
-  Window scale_highlighted_window_;
-
   WindowMinimizeSpeedController* minimize_speed_controller;
   friend class UnityWindow;
 };
@@ -409,7 +407,6 @@
   //! Emited when CompWindowNotifyBeforeDestroy is received
   sigc::signal<void> being_destroyed;
 
-  void scaleSelectWindow();
   void scalePaintDecoration(const GLWindowPaintAttrib &,
                             const GLMatrix &,
                             const CompRegion &,
 
=== modified file 'tests/autopilot/unity/tests/test_dash.py'
--- tests/autopilot/unity/tests/test_dash.py	2012-09-11 12:01:20 +0000
+++ tests/autopilot/unity/tests/test_dash.py	2012-09-13 15:55:51 +0000
@@ -107,22 +107,6 @@
         self.dash.reveal_application_lens()
         self.assertThat(self.dash.active_lens, Eventually(Equals('applications.lens')))
 
-    def test_dash_stays_on_same_monitor(self):
-        """If the dash is opened, then the mouse is moved to another monitor and
-        the keyboard is used. The Dash must not move to that monitor.
-        """
-
-        if self.screen_geo.get_num_monitors() < 2:
-          self.skip ("This test must be ran with more then 1 monitor.")
-
-        self.dash.ensure_visible()
-        self.addCleanup(self.dash.ensure_hidden)
-
-        self.screen_geo.move_mouse_to_monitor(1)
-        self.keyboard.type("abc")
-
-        self.assertThat(self.dash.ideal_monitor, Eventually(Equals(0)))
-
 
 class DashSearchInputTests(DashTestCase):
     """Test features involving input to the dash search"""
@@ -435,6 +419,9 @@
 class DashKeyboardFocusTests(DashTestCase):
     """Tests that keyboard focus works."""
 
+    def assertSearchText(self, text):
+        self.assertThat(self.dash.search_string, Eventually(Equals(text)))
+
     def test_filterbar_expansion_leaves_kb_focus(self):
         """Expanding or collapsing the filterbar must keave keyboard focus in the
         search bar.
@@ -447,7 +434,19 @@
         filter_bar.ensure_expanded()
         self.addCleanup(filter_bar.ensure_collapsed)
         self.keyboard.type(" world")
-        self.assertThat(self.dash.search_string, Eventually(Equals("hello world")))
+        self.assertSearchText("hello world")
+
+    def test_keep_focus_on_application_opens(self):
+        """The Dash must keep key focus as well as stay open if an app gets opened from an external source. """
+        
+        self.dash.ensure_visible()
+        self.addCleanup(self.hud.ensure_hidden)
+
+        self.start_app_window("Calculator")
+        sleep(1)
+
+        self.keyboard.type("HasFocus")
+        self.assertSearchText("HasFocus")
 
 
 class DashLensResultsTests(DashTestCase):
@@ -847,6 +846,7 @@
 
         self.assertThat(self.dash.preview_displaying, Eventually(Equals(False)))
 
+
 class DashDBusIfaceTests(DashTestCase):
     """Test the Unity dash DBus interface."""
 
@@ -856,3 +856,41 @@
         self.dash.controller.hide_dash_via_dbus()
         self.assertThat(self.dash.visible, Eventually(Equals(False)))
         self.dash.ensure_hidden()
+
+
+class DashCrossMonitorsTests(DashTestCase):
+    """Multi-monitor dash tests."""
+
+    def setUp(self):
+        super(DashCrossMonitorsTests, self).setUp()
+        if self.screen_geo.get_num_monitors() < 2:
+            self.skipTest("This test requires more than 1 monitor.")
+
+    def test_dash_stays_on_same_monitor(self):
+        """If the dash is opened, then the mouse is moved to another monitor and
+        the keyboard is used. The Dash must not move to that monitor.
+        """
+        current_monitor = self.dash.ideal_monitor
+
+        self.dash.ensure_visible()
+        self.addCleanup(self.dash.ensure_hidden)
+
+        self.screen_geo.move_mouse_to_monitor((current_monitor + 1) % self.screen_geo.get_num_monitors())
+        self.keyboard.type("abc")
+
+        self.assertThat(self.dash.ideal_monitor, Eventually(Equals(current_monitor)))
+
+    def test_dash_close_on_cross_monitor_click(self):
+        """Dash must close when clicking on a window in a different screen."""  
+
+        self.addCleanup(self.dash.ensure_hidden)
+
+        for monitor in range(self.screen_geo.get_num_monitors()-1):
+            self.screen_geo.move_mouse_to_monitor(monitor)
+            self.dash.ensure_visible()
+
+            self.screen_geo.move_mouse_to_monitor(monitor+1)
+            sleep(.5)
+            self.mouse.click()
+            
+            self.assertThat(self.dash.visible, Eventually(Equals(False)))
 
=== modified file 'tests/autopilot/unity/tests/test_hud.py'
--- tests/autopilot/unity/tests/test_hud.py	2012-09-07 17:36:50 +0000
+++ tests/autopilot/unity/tests/test_hud.py	2012-09-13 15:55:51 +0000
@@ -357,22 +357,6 @@
 
         self.assertThat(self.hud.visible, Eventually(Equals(False)))
 
-    def test_hud_stays_on_same_monitor(self):
-        """If the hud is opened, then the mouse is moved to another monitor and
-        the keyboard is used. The hud must not move to that monitor.
-        """
-
-        if self.screen_geo.get_num_monitors() < 2:
-            self.skip ("This test must be ran with more then 1 monitor.")
-
-        self.hud.ensure_visible()
-        self.addCleanup(self.hud.ensure_hidden)
-
-        self.screen_geo.move_mouse_to_monitor(1)
-        self.keyboard.type("abc")
-
-        self.assertThat(self.hud.ideal_monitor, Eventually(Equals(0)))
-
     def test_mouse_changes_selected_hud_button(self):
         """This tests moves the mouse from the top of the screen to the bottom, this must
         change the selected button from 1 to 5.
@@ -408,6 +392,18 @@
 
         self.assertThat(self.hud.view.selected_button, Eventually(Equals(1)))
 
+    def test_keep_focus_on_application_opens(self):
+        """The Hud must keep key focus as well as stay open if an app gets opened from an external source. """
+
+        self.hud.ensure_visible()
+        self.addCleanup(self.hud.ensure_hidden)
+
+        self.start_app_window("Calculator")
+        sleep(1)
+
+        self.keyboard.type("HasFocus")
+        self.assertThat(self.hud.search_string, Eventually(Equals("HasFocus")))
+
 
 class HudLauncherInteractionsTests(HudTestsBase):
 
@@ -661,3 +657,42 @@
         # Don't use reveal_hud, but be explicit in the keybindings.
         self.keyboard.press_and_release("Ctrl+Alt+h")
         self.assertThat(self.hud.visible, Eventually(Equals(True)))
+
+
+class HudCrossMonitorsTests(HudTestsBase):
+    """Multi-monitor hud tests."""
+
+    def setUp(self):
+        super(HudCrossMonitorsTests, self).setUp()
+        if self.screen_geo.get_num_monitors() < 2:
+            self.skipTest("This test requires more than 1 monitor.")
+
+    def test_hud_stays_on_same_monitor(self):
+        """If the hud is opened, then the mouse is moved to another monitor and
+        the keyboard is used. The hud must not move to that monitor.
+        """
+
+        current_monitor = self.hud.ideal_monitor
+
+        self.hud.ensure_visible()
+        self.addCleanup(self.hud.ensure_hidden)
+
+        self.screen_geo.move_mouse_to_monitor((current_monitor + 1) % self.screen_geo.get_num_monitors())
+        self.keyboard.type("abc")
+
+        self.assertThat(self.hud.ideal_monitor, Eventually(Equals(current_monitor)))
+
+    def test_hud_close_on_cross_monitor_click(self):
+        """Hud must close when clicking on a window in a different screen."""
+
+        self.addCleanup(self.hud.ensure_hidden)
+
+        for monitor in range(self.screen_geo.get_num_monitors()-1):
+            self.screen_geo.move_mouse_to_monitor(monitor)
+            self.hud.ensure_visible()
+
+            self.screen_geo.move_mouse_to_monitor(monitor+1)
+            sleep(.5)
+            self.mouse.click()
+            
+            self.assertThat(self.hud.visible, Eventually(Equals(False)))
 
=== modified file 'unity-shared/DashStyle.cpp'
--- unity-shared/DashStyle.cpp	2012-08-20 19:59:54 +0000
+++ unity-shared/DashStyle.cpp	2012-09-13 15:55:51 +0000
@@ -196,6 +196,8 @@
   int text_height_;
   int number_of_columns_;
 
+  LazyLoadTexture category_texture_;
+  LazyLoadTexture category_texture_no_filters_;
   LazyLoadTexture dash_bottom_texture_;
   LazyLoadTexture dash_bottom_texture_mask_;
   LazyLoadTexture dash_right_texture_;
@@ -218,6 +220,11 @@
   LazyLoadTexture search_close_texture_;
   LazyLoadTexture search_spin_texture_;
 
+
+  LazyLoadTexture refine_gradient_corner_;
+  LazyLoadTexture refine_gradient_dash_;
+  LazyLoadTexture refine_gradient_no_refine_dash_;
+
   LazyLoadTexture group_unexpand_texture_;
   LazyLoadTexture group_expand_texture_;
 
@@ -239,6 +246,8 @@
   , text_width_(0)
   , text_height_(0)
   , number_of_columns_(6)
+  , category_texture_("/category_gradient.png")
+  , category_texture_no_filters_("/category_gradient_no_refine.png")
   , dash_bottom_texture_("/dash_bottom_border_tile.png")
   , dash_bottom_texture_mask_("/dash_bottom_border_tile_mask.png")
   , dash_right_texture_("/dash_right_border_tile.png")
@@ -258,6 +267,9 @@
   , search_circle_texture_("/search_circle.svg", 32)
   , search_close_texture_("/search_close.svg", 32)
   , search_spin_texture_("/search_spin.svg", 32)
+  , refine_gradient_corner_("/refine_gradient_corner.png")
+  , refine_gradient_dash_("/refine_gradient_dash.png")
+  , refine_gradient_no_refine_dash_("/refine_gradient_dash_no_refine.png")
   , group_unexpand_texture_("/dash_group_unexpand.png")
   , group_expand_texture_("/dash_group_expand.png")
   , star_deselected_texture_("/star_deselected.png")
@@ -2081,6 +2093,16 @@
 }
 
 
+nux::BaseTexture* Style::GetCategoryBackground()
+{
+  return pimpl->category_texture_.texture();
+}
+
+nux::BaseTexture* Style::GetCategoryBackgroundNoFilters()
+{
+  return pimpl->category_texture_no_filters_.texture(); 
+}
+
 nux::BaseTexture* Style::GetDashBottomTile()
 {
   return pimpl->dash_bottom_texture_.texture();
@@ -2171,6 +2193,21 @@
   return pimpl->search_spin_texture_.texture();
 }
 
+nux::BaseTexture* Style::GetRefineTextureCorner()
+{
+  return pimpl->refine_gradient_corner_.texture();
+}
+
+nux::BaseTexture* Style::GetRefineNoRefineTextureDash()
+{
+  return pimpl->refine_gradient_no_refine_dash_.texture(); 
+}
+
+nux::BaseTexture* Style::GetRefineTextureDash()
+{
+  return pimpl->refine_gradient_dash_.texture(); 
+}
+
 nux::BaseTexture* Style::GetGroupUnexpandIcon()
 {
   return pimpl->group_unexpand_texture_.texture();
 
=== modified file 'unity-shared/DashStyle.h'
--- unity-shared/DashStyle.h	2012-08-20 19:59:54 +0000
+++ unity-shared/DashStyle.h	2012-09-13 15:55:51 +0000
@@ -165,6 +165,8 @@
 
   int GetTextLineHeight() const;
 
+  nux::BaseTexture* GetCategoryBackground();
+  nux::BaseTexture* GetCategoryBackgroundNoFilters();
   nux::BaseTexture* GetDashBottomTile();
   nux::BaseTexture* GetDashBottomTileMask();
   nux::BaseTexture* GetDashRightTile();
@@ -196,7 +198,11 @@
   nux::BaseTexture* GetStarDeselectedIcon();
   nux::BaseTexture* GetStarSelectedIcon();
   nux::BaseTexture* GetStarHighlightIcon();
-
+  
+  nux::BaseTexture* GetRefineTextureCorner();
+  nux::BaseTexture* GetRefineTextureDash();
+  nux::BaseTexture* GetRefineNoRefineTextureDash();
+  
   // Returns the width of the separator between the dash and the launcher.
   int GetVSeparatorSize() const;
 
@@ -206,6 +212,7 @@
   // 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;
 
=== modified file 'unity-shared/OverlayRenderer.cpp'
--- unity-shared/OverlayRenderer.cpp	2012-05-22 10:15:47 +0000
+++ unity-shared/OverlayRenderer.cpp	2012-09-13 15:55:51 +0000
@@ -64,10 +64,19 @@
   nux::ObjectPtr <nux::IOpenGLBaseTexture> bg_blur_texture_;
   nux::ObjectPtr <nux::IOpenGLBaseTexture> bg_shine_texture_;
 
+
+  nux::ObjectPtr<nux::BaseTexture> bg_refine_tex_;
+  nux::ObjectPtr<nux::BaseTexture> bg_refine_no_refine_tex_;
+  nux::ObjectPtr<nux::BaseTexture> bg_refine_corner_tex_;
+  std::unique_ptr<nux::AbstractPaintLayer> bg_refine_gradient_;
+  std::unique_ptr<nux::AbstractPaintLayer> bg_refine_gradient_corner_;
+
   // temporary variable that stores the number of backgrounds we have rendered
   int bgs;
   bool visible;
 
+  bool refine_is_open_;
+
   UBusManager ubus_manager_;
 
   OverlayRenderer *parent;
@@ -107,16 +116,67 @@
   rop.DstBlend = GL_ONE_MINUS_SRC_ALPHA;
   bg_layer_ = new nux::ColorLayer(nux::Color(0.0f, 0.0f, 0.0f, 0.9), true, rop);
 
+  nux::TexCoordXForm texxform;
+  bg_refine_tex_ = unity::dash::Style::Instance().GetRefineTextureDash();
+  bg_refine_no_refine_tex_ = unity::dash::Style::Instance().GetRefineNoRefineTextureDash();
+  
+  bg_refine_gradient_.reset(new nux::TextureLayer(bg_refine_tex_->GetDeviceTexture(), 
+                            texxform, 
+                            nux::color::White,
+                            false,
+                            rop));
+
+  bg_refine_corner_tex_ = unity::dash::Style::Instance().GetRefineTextureCorner();
+
+  bg_refine_gradient_corner_.reset(new nux::TextureLayer(bg_refine_corner_tex_->GetDeviceTexture(), 
+                                  texxform, 
+                                  nux::color::White,
+                                  false,
+                                  rop));
+ 
+ ubus_manager_.RegisterInterest(UBUS_BACKGROUND_COLOR_CHANGED,
+                                 sigc::mem_fun(this, &OverlayRendererImpl::OnBackgroundColorChanged));
+
   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);
+
+  ubus_manager_.RegisterInterest(UBUS_REFINE_STATUS, [this] (GVariant *data) 
+  {
+    gboolean status;
+    g_variant_get(data, UBUS_REFINE_STATUS_FORMAT_STRING, &status);
+
+    refine_is_open_ = status;
+    nux::ROPConfig rop;
+    rop.Blend = true;
+    rop.SrcBlend = GL_ONE;
+    rop.DstBlend = GL_ONE_MINUS_SRC_ALPHA;
+
+    nux::TexCoordXForm texxform;
+
+    if (refine_is_open_)
+    {
+      bg_refine_gradient_.reset(new nux::TextureLayer(bg_refine_tex_->GetDeviceTexture(), 
+                                texxform, 
+                                nux::color::White,
+                                false,
+                                rop));
+    }
+    else
+    {
+      bg_refine_gradient_.reset(new nux::TextureLayer(bg_refine_no_refine_tex_->GetDeviceTexture(),
+                                texxform,
+                                nux::color::White,
+                                false,
+                                rop));
+    }
+
+    parent->need_redraw.emit();
+  });
 }
 
 void OverlayRendererImpl::OnBackgroundColorChanged(GVariant* args)
@@ -442,9 +502,9 @@
   gfx_context.GetRenderStates().SetPremultipliedBlend(nux::SRC_OVER);
 
   const double line_opacity = 0.1f;
-  const int gradient_width = 130;
+  //const int gradient_width = 130;
   const int gradient_height = 50;
-  const int horizontal_padding = 40;
+  //const int horizontal_padding = 40;
   const int vertical_padding = 20;
 
   // Now that we mask the corners of the dash,
@@ -471,7 +531,7 @@
                                line_color * 0.7f); // less opacity
 
   // Horizontal panel/dash separator
-  nux::GetPainter().Paint2DQuadColor(gfx_context,
+  /*nux::GetPainter().Paint2DQuadColor(gfx_context,
                                      nux::Geometry(geometry.x + horizontal_padding,
                                                    geometry.y,
                                                    gradient_width,
@@ -486,7 +546,7 @@
                                geometry.x + content_geo.width + INNER_CORNER_RADIUS + corner_overlap,
                                style.GetHSeparatorSize(),
                                line_color);
-
+*/
   // Draw the background
   bg_darken_layer_->SetGeometry(larger_content_geo);
   nux::GetPainter().RenderSinglePaintLayer(gfx_context, larger_content_geo, bg_darken_layer_);
@@ -510,6 +570,33 @@
                         larger_content_geo.width, larger_content_geo.height,
                         bg_shine_texture_, texxform_absolute_bg, nux::color::White);
 
+  gfx_context.GetRenderStates().SetBlend(true, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
+  nux::TexCoordXForm refine_texxform;
+
+  if (refine_is_open_)
+  { 
+    gfx_context.QRP_1Tex(larger_content_geo.x + larger_content_geo.width - bg_refine_tex_->GetWidth(), 
+                       larger_content_geo.y,
+                       bg_refine_tex_->GetWidth(), 
+                       bg_refine_tex_->GetHeight(),
+                       bg_refine_tex_->GetDeviceTexture(),
+                       refine_texxform,
+                       nux::color::White
+                       );
+  }
+  else
+  {
+    gfx_context.QRP_1Tex(larger_content_geo.x + larger_content_geo.width - bg_refine_no_refine_tex_->GetWidth(), 
+                       larger_content_geo.y,
+                       bg_refine_no_refine_tex_->GetWidth(), 
+                       bg_refine_no_refine_tex_->GetHeight(),
+                       bg_refine_no_refine_tex_->GetDeviceTexture(),
+                       refine_texxform,
+                       nux::color::White
+                       );
+  }
+
+
   if (Settings::Instance().GetFormFactor() != FormFactor::NETBOOK || force_edges)
   {
     // Paint the edges
@@ -850,6 +937,24 @@
                                      false,
                                      rop);
   bgs++;
+
+  nux::Geometry refine_geo = larger_content_geo;
+  
+  if (refine_is_open_)
+  {
+    refine_geo.x += larger_content_geo.width - bg_refine_tex_->GetWidth();
+    refine_geo.width = bg_refine_tex_->GetWidth();
+    refine_geo.height = bg_refine_tex_->GetHeight();
+  }
+  else
+  {
+    refine_geo.x += larger_content_geo.width - bg_refine_no_refine_tex_->GetWidth();
+    refine_geo.width = bg_refine_no_refine_tex_->GetWidth();
+    refine_geo.height = bg_refine_no_refine_tex_->GetHeight();
+  }
+    
+  nux::GetPainter().PushLayer(gfx_context, refine_geo, bg_refine_gradient_.get());
+  bgs++;
 }
 
 void OverlayRendererImpl::DrawContentCleanup(nux::GraphicsEngine& gfx_context, nux::Geometry content_geo, nux::Geometry absolute_geo, nux::Geometry geometry)
 
=== modified file 'unity-shared/PreviewStyle.cpp'
--- unity-shared/PreviewStyle.cpp	2012-09-06 07:03:54 +0000
+++ unity-shared/PreviewStyle.cpp	2012-09-13 15:55:51 +0000
@@ -224,7 +224,7 @@
 
 int Style::GetActionButtonHeight() const
 {
-  return 36;
+  return 34;
 }
 
 int Style::GetActionButtonMaximumWidth() const
 
=== modified file 'unity-shared/UBusMessages.h'
--- unity-shared/UBusMessages.h	2012-08-27 03:00:42 +0000
+++ unity-shared/UBusMessages.h	2012-09-13 15:55:51 +0000
@@ -40,6 +40,9 @@
 #define UBUS_OVERLAY_HIDDEN "OVERLAY_HIDDEN"
 #define UBUS_OVERLAY_SHOWN "OVERLAY_SHOWN"
 
+#define UBUS_REFINE_STATUS_FORMAT_STRING "(b)"
+#define UBUS_REFINE_STATUS "REFINE_STATUS"
+
 #define UBUS_PLACE_VIEW_QUEUE_DRAW "PLACE_VIEW_QUEUE_DRAW"
 
 // Signal send by Launcher/Quicklist when it wants to exit key-nav and wants to
 
=== modified file 'unity-standalone/StandaloneUnity.cpp'
--- unity-standalone/StandaloneUnity.cpp	2012-07-27 20:20:29 +0000
+++ unity-standalone/StandaloneUnity.cpp	2012-09-13 15:55:51 +0000
@@ -45,7 +45,7 @@
 
 namespace
 {
-  static int display_width = 1280;
+  static int display_width = 1200;
   static int display_height = 720;
   static gboolean no_window_decorations = FALSE;
   static gboolean force_tv = FALSE;
@@ -89,7 +89,9 @@
   launcher_controller.reset(new launcher::Controller(0));
   panel_controller.reset(new panel::Controller());
   dash_controller.reset(new dash::Controller());
+
   dash_controller->launcher_width = launcher_controller->launcher().GetAbsoluteWidth() - 1;
+  panel_controller->launcher_width = launcher_controller->launcher().GetAbsoluteWidth() - 1;
 }
 
 void UnityStandalone::InitWindowThread(nux::NThread* thread, void* InitData)