Merge lp:~njpatel/unity/dash-fixes-2011-08-22 into lp:unity

[Neil J. Patel]

Miscellaneous fixes for the dash for renderering and also fixes a bunch of bugs.

=== modified file 'UnityCore/Lens.cpp'
--- UnityCore/Lens.cpp	2011-08-10 09:51:24 +0000
+++ UnityCore/Lens.cpp	2011-08-24 12:31:11 +0000
@@ -173,7 +173,6 @@
   glib::String search_string;
 
   g_variant_get(parameters, "(sa{sv})", &search_string, NULL);
-  g_debug ("HELLO");
   owner_->search_finished.emit(search_string.Str());
 }
 
 
=== modified file 'plugins/unityshell/src/BFBLauncherIcon.cpp'
--- plugins/unityshell/src/BFBLauncherIcon.cpp	2011-08-03 14:25:30 +0000
+++ plugins/unityshell/src/BFBLauncherIcon.cpp	2011-08-24 12:31:11 +0000
@@ -50,6 +50,7 @@
   if (arg.button == 1)
   {
     UBusServer* ubus = ubus_server_get_default();
-    ubus_server_send_message(ubus, UBUS_DASH_EXTERNAL_ACTIVATION, NULL);
+    ubus_server_send_message(ubus, UBUS_PLACE_ENTRY_ACTIVATE_REQUEST,
+                             g_variant_new("(sus)", "home.lens", 0, ""));
   }
 }
 
=== modified file 'plugins/unityshell/src/DashSearchBarSpinner.cpp'
--- plugins/unityshell/src/DashSearchBarSpinner.cpp	2011-08-09 17:45:12 +0000
+++ plugins/unityshell/src/DashSearchBarSpinner.cpp	2011-08-24 12:31:11 +0000
@@ -52,6 +52,9 @@
 {
   if (_spinner_timeout)
     g_source_remove(_spinner_timeout);
+
+  if (_frame_timeout)
+    g_source_remove(_frame_timeout);
 }
 
 long
@@ -157,8 +160,10 @@
                         texxform,
                         nux::color::White);
   }
-
   GfxContext.PopClippingRectangle();
+
+  if (_state == STATE_SEARCHING && !_frame_timeout)
+    _frame_timeout = g_timeout_add(22, (GSourceFunc)SearchBarSpinner::OnFrame, this);
 }
 
 void
@@ -167,18 +172,24 @@
 }
 
 gboolean
+SearchBarSpinner::OnTimeout(SearchBarSpinner* self)
+{
+  self->_state = STATE_READY;
+  return FALSE;
+}
+
+gboolean
 SearchBarSpinner::OnFrame(SearchBarSpinner* self)
 {
   self->_rotation += 0.1f;
-
   if (self->_rotation >= 360.0f)
     self->_rotation = 0.0f;
 
   self->_2d_rotate.Rotate_z(self->_rotation);
+  self->_frame_timeout = 0;
 
   self->QueueDraw();
-
-  return TRUE;
+  return FALSE;
 }
 
 void
@@ -192,12 +203,13 @@
   if (_spinner_timeout)
     g_source_remove(_spinner_timeout);
   _spinner_timeout = 0;
+  
   _2d_rotate.Rotate_z(0.0f);
   _rotation = 0.0f;
 
   if (_state == STATE_SEARCHING)
   {
-    _spinner_timeout = g_timeout_add(15, (GSourceFunc)SearchBarSpinner::OnFrame, this);
+    _spinner_timeout = g_timeout_add_seconds(5, (GSourceFunc)SearchBarSpinner::OnTimeout, this);
   }
 
   QueueDraw();
 
=== modified file 'plugins/unityshell/src/DashSearchBarSpinner.h'
--- plugins/unityshell/src/DashSearchBarSpinner.h	2011-08-09 06:24:59 +0000
+++ plugins/unityshell/src/DashSearchBarSpinner.h	2011-08-24 12:31:11 +0000
@@ -56,6 +56,7 @@
   // Introspectable methods
   const gchar* GetName();
   void AddProperties(GVariantBuilder* builder);
+  static gboolean OnTimeout(SearchBarSpinner* self);
   static gboolean OnFrame(SearchBarSpinner* self);
 
   // Key navigation
@@ -76,6 +77,7 @@
   float        _rotation;
 
   guint32 _spinner_timeout;
+  guint32 _frame_timeout;
 };
 
 }
 
=== modified file 'plugins/unityshell/src/DashView.cpp'
--- plugins/unityshell/src/DashView.cpp	2011-08-22 13:48:47 +0000
+++ plugins/unityshell/src/DashView.cpp	2011-08-24 12:31:11 +0000
@@ -55,7 +55,7 @@
   mouse_down.connect(sigc::mem_fun(this, &DashView::OnMouseButtonDown));
 
   Relayout();
-  OnLensBarActivated("home");
+  lens_bar_->Activate("home.lens");
 
   bg_effect_helper_.owner = this;
   bg_effect_helper_.enabled = false;
@@ -105,7 +105,7 @@
 
   home_view_ = new HomeView();
   active_lens_view_ = home_view_;
-  lens_views_["home"] = home_view_;
+  lens_views_["home.lens"] = home_view_;
   lenses_layout_->AddView(home_view_);
 
   lens_bar_ = new LensBar();
@@ -117,8 +117,6 @@
 {
   ubus_manager_.RegisterInterest(UBUS_PLACE_ENTRY_ACTIVATE_REQUEST,
       sigc::mem_fun(this, &DashView::OnActivateRequest));
-  ubus_manager_.RegisterInterest(UBUS_PLACE_VIEW_QUEUE_DRAW,
-      [&] (GVariant* args) { QueueDraw(); });
   ubus_manager_.RegisterInterest(UBUS_BACKGROUND_COLOR_CHANGED,
       sigc::mem_fun(this, &DashView::OnBackgroundColorChanged));
 }
@@ -260,7 +258,7 @@
                           texxform,
                           nux::color::White);
     }
-   {
+    {
       // Bottom repeated texture
       int real_width = geo.width - corner->GetWidth();
       int offset = real_width % bottom->GetWidth();
@@ -276,7 +274,6 @@
                           texxform,
                           nux::color::White);
     }
-
     {
       // Right repeated texture
       int real_height = geo.height - corner->GetHeight();
@@ -358,7 +355,7 @@
 
   g_variant_get(args, "(sus)", &id, NULL, &search_string);
 
-  OnLensBarActivated(id.Str());
+  lens_bar_->Activate(id.Str());
 
   // Reset focus
   SetFocused(false);
@@ -405,8 +402,6 @@
 
   lens->activated.connect(sigc::mem_fun(this, &DashView::OnUriActivatedReply));
   lens->search_finished.connect(sigc::mem_fun(this, &DashView::OnSearchFinished));
-
-  lens->Search("");
 }
 
 void DashView::OnLensBarActivated(std::string const& id)
@@ -418,7 +413,10 @@
   }
 
   for (auto it: lens_views_)
+  {
     it.second->SetVisible(it.first == id);
+    it.second->active = it.first == id;
+  }
 
   LensView* view = active_lens_view_ = lens_views_[id];
   search_bar_->search_string = view->search_string;
@@ -447,7 +445,6 @@
 void DashView::OnUriActivatedReply(std::string const& uri, HandledType type, Lens::Hints const&)
 {
   // We don't want to close the dash if there was another activation pending
-
   if (type == NOT_HANDLED)
   {
     if (!DoFallbackActivation(uri))
 
=== modified file 'plugins/unityshell/src/FilterExpanderLabel.cpp'
--- plugins/unityshell/src/FilterExpanderLabel.cpp	2011-08-19 15:17:30 +0000
+++ plugins/unityshell/src/FilterExpanderLabel.cpp	2011-08-24 12:31:11 +0000
@@ -34,7 +34,7 @@
       , contents_ (NULL)
       , right_hand_contents_ (NULL)
       , expander_graphic_ (NULL)
-      , label_("<span font_size='x-large'>" + label + "</span>")
+      , label_("<span font_size='larger'>" + label + "</span>")
   {
     expanded.changed.connect (sigc::mem_fun(this, &FilterExpanderLabel::DoExpandChange));
     BuildLayout ();
@@ -46,7 +46,7 @@
 
   void FilterExpanderLabel::SetLabel (std::string label)
   {
-    label_ = "<style size='x-large'>" + label + "</style>";
+    label_ = "<style size='larger'>" + label + "</style>";
     cairo_label_->SetText(label.c_str());
   }
 
 
=== modified file 'plugins/unityshell/src/FilterGenreWidget.cpp'
--- plugins/unityshell/src/FilterGenreWidget.cpp	2011-08-17 15:00:14 +0000
+++ plugins/unityshell/src/FilterGenreWidget.cpp	2011-08-24 12:31:11 +0000
@@ -25,6 +25,7 @@
 #include "FilterGenreWidget.h"
 #include "FilterGenreButton.h"
 #include "FilterBasicButton.h"
+#include "PlacesStyle.h"
 
 namespace unity {
 
@@ -37,13 +38,15 @@
     all_button_->activated.connect(sigc::mem_fun(this, &FilterGenre::OnAllActivated));
     all_button_->Reference();
 
+    PlacesStyle* style = PlacesStyle::GetDefault();
+
     genre_layout_ = new nux::GridHLayout(NUX_TRACKER_LOCATION);
     genre_layout_->ForceChildrenSize(true);
     genre_layout_->SetHeightMatchContent(true);
     genre_layout_->SetVerticalInternalMargin (6);
     genre_layout_->SetHorizontalInternalMargin (6);
     genre_layout_->EnablePartialVisibility (false);
-    genre_layout_->SetChildrenSize (120, 40);
+    genre_layout_->SetChildrenSize (style->GetTileWidth() - 12, style->GetTextLineHeight() * 2);
     genre_layout_->Reference();
 
     SetRightHandView(all_button_);
 
=== modified file 'plugins/unityshell/src/FilterMultiRangeButton.cpp'
--- plugins/unityshell/src/FilterMultiRangeButton.cpp	2011-08-22 12:04:21 +0000
+++ plugins/unityshell/src/FilterMultiRangeButton.cpp	2011-08-24 12:31:11 +0000
@@ -122,7 +122,7 @@
       normal_ = new nux::CairoWrapper(GetGeometry(), sigc::bind(sigc::mem_fun(this, &FilterMultiRangeButton::RedrawTheme), nux::State::NUX_STATE_NORMAL));
     }
 
-    SetMinimumHeight(32);
+    //SetMinimumHeight(32);
   }
 
   void FilterMultiRangeButton::RedrawTheme (nux::Geometry const& geom, cairo_t *cr, nux::State faked_state)
 
=== added file 'plugins/unityshell/src/FontSettings.cpp'
--- plugins/unityshell/src/FontSettings.cpp	1970-01-01 00:00:00 +0000
+++ plugins/unityshell/src/FontSettings.cpp	2011-08-24 12:31:11 +0000
@@ -0,0 +1,88 @@
+/*
+ * Copyright (C) 2011 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Neil Jagdish Patel <[e-mail]>
+ */
+
+#include "FontSettings.h"
+
+#include <cairo/cairo.h>
+
+#include <UnityCore/GLibWrapper.h>
+
+namespace unity
+{
+
+FontSettings::FontSettings()
+{
+  GtkSettings* settings = gtk_settings_get_default();
+
+  sig_man_.Add(new glib::Signal<void, GtkSettings*, GParamSpec*>(settings, "notify::gtk-xft-hintstyle", sigc::mem_fun(this, &FontSettings::Refresh)));
+  sig_man_.Add(new glib::Signal<void, GtkSettings*, GParamSpec*>(settings, "notify::gtk-xft-rgba", sigc::mem_fun(this, &FontSettings::Refresh)));
+
+  Refresh();
+}
+
+void FontSettings::Refresh(GtkSettings* unused0, GParamSpec* unused1)
+{
+  GtkSettings* settings = gtk_settings_get_default();
+  cairo_font_options_t* font_options = cairo_font_options_create();
+
+  {
+    cairo_subpixel_order_t order = CAIRO_SUBPIXEL_ORDER_DEFAULT;
+    glib::String value;
+    g_object_get(settings, "gtk-xft-rgba", &value, NULL);
+    
+    if (value.Str() == "rgb")
+      order = CAIRO_SUBPIXEL_ORDER_RGB;
+    else if (value.Str() == "bgr")
+      order = CAIRO_SUBPIXEL_ORDER_BGR;
+    else if (value.Str() == "vrgb")
+      order = CAIRO_SUBPIXEL_ORDER_VRGB;
+    else if (value.Str() == "vbgr")
+      order = CAIRO_SUBPIXEL_ORDER_VBGR;
+
+    cairo_font_options_set_subpixel_order(font_options, order);
+    cairo_font_options_set_antialias(font_options,
+                                     value.Str() == "none" ? CAIRO_ANTIALIAS_NONE 
+                                                           : CAIRO_ANTIALIAS_SUBPIXEL);
+
+  }
+
+  {
+    cairo_hint_style_t style = CAIRO_HINT_STYLE_DEFAULT;
+    glib::String value;
+    g_object_get(settings, "gtk-xft-hintstyle", &value, NULL);
+    
+    if (value.Str() == "hintnone")
+      style = CAIRO_HINT_STYLE_NONE;
+    else if (value.Str() == "hintslight")
+      style = CAIRO_HINT_STYLE_SLIGHT;
+    else if (value.Str() == "hintmedium")
+      style = CAIRO_HINT_STYLE_MEDIUM;
+    else if (value.Str() == "hintfull")
+      style = CAIRO_HINT_STYLE_FULL;
+
+    cairo_font_options_set_hint_style(font_options, style);
+  }
+  
+  // FIXME: Where do we read this value from?
+  cairo_font_options_set_hint_metrics(font_options, CAIRO_HINT_METRICS_ON);
+
+  gdk_screen_set_font_options(gdk_screen_get_default(), font_options);
+  cairo_font_options_destroy(font_options);
+}
+
+}
 
=== added file 'plugins/unityshell/src/FontSettings.h'
--- plugins/unityshell/src/FontSettings.h	1970-01-01 00:00:00 +0000
+++ plugins/unityshell/src/FontSettings.h	2011-08-24 12:31:11 +0000
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2011 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Neil Jagdish Patel <[e-mail]>
+ */
+
+#ifndef UNITY_FONT_SETTINGS_H_
+#define UNITY_FONT_SETTINGS_H_
+
+#include <gtk/gtk.h>
+
+#include <UnityCore/GLibSignal.h>
+
+namespace unity
+{
+
+class FontSettings
+{
+public:
+  FontSettings();
+
+private:
+  void Refresh(GtkSettings* unused0=nullptr, GParamSpec* unused1=nullptr);
+
+private:
+  glib::SignalManager sig_man_;
+};
+
+}
+
+#endif
 
=== modified file 'plugins/unityshell/src/HomeView.cpp'
--- plugins/unityshell/src/HomeView.cpp	2011-08-11 16:04:49 +0000
+++ plugins/unityshell/src/HomeView.cpp	2011-08-24 12:31:11 +0000
@@ -39,6 +39,7 @@
 NUX_IMPLEMENT_OBJECT_TYPE(HomeView);
 
 HomeView::HomeView()
+  : fix_renderering_id_(0)
 {
   SetupViews();
 
@@ -52,11 +53,17 @@
       group->SetVisible(search != "" && counts_[group]);
     }
     home_view_->SetVisible(search == "");
+    scroll_view_->SetVisible(search != "");
+
+    QueueDraw();
   });
 }
 
 HomeView::~HomeView()
-{}
+{
+  if (fix_renderering_id_)
+    g_source_remove(fix_renderering_id_);
+}
 
 void HomeView::SetupViews()
 {
@@ -65,13 +72,14 @@
   scroll_view_ = new nux::ScrollView();
   scroll_view_->EnableVerticalScrollBar(true);
   scroll_view_->EnableHorizontalScrollBar(false);
+  scroll_view_->SetVisible(false);
   layout_->AddView(scroll_view_);
   
   scroll_layout_ = new nux::VLayout();
   scroll_view_->SetLayout(scroll_layout_);
 
   home_view_ = new PlacesHomeView();
-  scroll_layout_->AddView(home_view_);
+  layout_->AddView(home_view_);
 
   SetLayout(layout_);
 }
@@ -124,6 +132,8 @@
   PlacesStyle* style = PlacesStyle::GetDefault();
   group->SetCounts(style->GetDefaultNColumns(), counts_[group]);
   group->SetVisible(counts_[group]);
+
+  QueueFixRenderering();
 }
 
 void HomeView::OnGroupExpanded(PlacesGroup* group)
@@ -143,6 +153,34 @@
   }
 }
 
+void HomeView::QueueFixRenderering()
+{
+  if (fix_renderering_id_)
+    return;
+
+  fix_renderering_id_ = g_timeout_add(0, (GSourceFunc)FixRenderering, this);
+}
+
+gboolean HomeView::FixRenderering(HomeView* self)
+{
+  std::list<Area*> children = self->scroll_layout_->GetChildren();
+  std::list<Area*>::reverse_iterator rit;
+  bool found_one = false;
+
+  for (rit = children.rbegin(); rit != children.rend(); ++rit)
+  {
+    PlacesGroup* group = static_cast<PlacesGroup*>(*rit);
+
+    if (group->IsVisible())
+      group->SetDrawSeparator(found_one);
+
+    found_one = group->IsVisible();
+  }
+
+  self->fix_renderering_id_ = 0;
+  return FALSE;
+}
+
 long HomeView::ProcessEvent(nux::IEvent& ievent, long traverse_info, long event_info)
 {
   return layout_->ProcessEvent(ievent, traverse_info, event_info);
 
=== modified file 'plugins/unityshell/src/HomeView.h'
--- plugins/unityshell/src/HomeView.h	2011-08-11 01:12:21 +0000
+++ plugins/unityshell/src/HomeView.h	2011-08-24 12:31:11 +0000
@@ -60,6 +60,9 @@
   void UpdateCounts(PlacesGroup* group);
   void OnGroupExpanded(PlacesGroup* group);
   void OnColumnsChanged();
+  void QueueFixRenderering();
+
+  static gboolean FixRenderering(HomeView* self);
 
   long ProcessEvent(nux::IEvent& ievent, long traverse_info, long event_info);
   void Draw(nux::GraphicsEngine& gfx_context, bool force_draw);
@@ -80,6 +83,8 @@
   nux::VLayout* scroll_layout_;
 
   PlacesHomeView* home_view_;
+
+  guint fix_renderering_id_;
 };
 
 
 
=== modified file 'plugins/unityshell/src/IconTexture.cpp'
--- plugins/unityshell/src/IconTexture.cpp	2011-08-02 13:37:01 +0000
+++ plugins/unityshell/src/IconTexture.cpp	2011-08-24 12:31:11 +0000
@@ -250,6 +250,11 @@
   _texture_cached->Reference();
 }
 
+nux::BaseTexture* IconTexture::texture() const
+{
+  return _texture_cached;
+}
+
 bool
 IconTexture::DoCanFocus()
 {
 
=== modified file 'plugins/unityshell/src/IconTexture.h'
--- plugins/unityshell/src/IconTexture.h	2011-07-21 14:59:25 +0000
+++ plugins/unityshell/src/IconTexture.h	2011-08-24 12:31:11 +0000
@@ -45,6 +45,8 @@
 
   void SetAcceptKeyNavFocus(bool accept);
 
+  nux::BaseTexture* texture() const;
+
 protected:
   // Key navigation
   virtual bool AcceptKeyNavFocus();
@@ -54,9 +56,9 @@
   void AddProperties(GVariantBuilder* builder);
   virtual bool DoCanFocus();
 
+protected:
+  void Draw(nux::GraphicsEngine& GfxContext, bool force_draw);
 private:
-  void Draw(nux::GraphicsEngine& GfxContext, bool force_draw);
-
   void CreateTextureCallback(const char* texid, int width, int height, nux::BaseTexture** texture);
   void Refresh(GdkPixbuf* pixbuf);
   void IconLoaded(const char* icon_name, guint size, GdkPixbuf* pixbuf);
 
=== modified file 'plugins/unityshell/src/Launcher.cpp'
--- plugins/unityshell/src/Launcher.cpp	2011-08-23 23:23:47 +0000
+++ plugins/unityshell/src/Launcher.cpp	2011-08-24 12:31:11 +0000
@@ -1385,7 +1385,9 @@
 
   // it's a tap on super and we didn't use any shortcuts
   if (TapOnSuper() && !_latest_shortcut)
-    ubus_server_send_message(ubus_server_get_default(), UBUS_DASH_EXTERNAL_ACTIVATION, NULL);
+    ubus_server_send_message(ubus_server_get_default(),
+                             UBUS_PLACE_ENTRY_ACTIVATE_REQUEST,
+                             g_variant_new("(sus)", "home.lens", 0, ""));
 
   remaining_time_before_hide = BEFORE_HIDE_LAUNCHER_ON_SUPER_DURATION - CLAMP((int)(TimeDelta(&current, &_times[TIME_SUPER_PRESSED])), 0, BEFORE_HIDE_LAUNCHER_ON_SUPER_DURATION);
 
 
=== modified file 'plugins/unityshell/src/LensBar.cpp'
--- plugins/unityshell/src/LensBar.cpp	2011-08-18 15:42:39 +0000
+++ plugins/unityshell/src/LensBar.cpp	2011-08-24 12:31:11 +0000
@@ -38,24 +38,8 @@
   : nux::View(NUX_TRACKER_LOCATION)
 {
   SetupBackground();
-
-  layout_ = new nux::HLayout();
-  layout_->SetContentDistribution(nux::MAJOR_POSITION_CENTER);
-  layout_->SetHorizontalInternalMargin(24);
-  SetLayout(layout_);
-
-  SetMinimumHeight(40);
-  SetMaximumHeight(40);
-
-  {
-    std::string id = "home";
-    IconTexture* icon = new IconTexture(PKGDATADIR"/lens-nav-home.svg", 26);
-    icon->SetMinMaxSize(26, 26);
-    icon->SetVisible(true);
-    layout_->AddView(icon, 0, nux::eCenter, nux::eFix);
-
-    icon->mouse_click.connect([&, id] (int x, int y, unsigned long button, unsigned long keyboard) { lens_activated.emit(id); });
-  }
+  SetupLayout();
+  SetupHomeLens();
 }
 
 LensBar::~LensBar()
@@ -70,18 +54,49 @@
   bg_layer_ = new nux::ColorLayer(nux::Color(0.0f, 0.0f, 0.0f, 0.2f), true, rop);
 }
 
+void LensBar::SetupLayout()
+{
+  layout_ = new nux::HLayout();
+  layout_->SetContentDistribution(nux::MAJOR_POSITION_CENTER);
+  layout_->SetHorizontalInternalMargin(32);
+  SetLayout(layout_);
+
+  SetMinimumHeight(40);
+  SetMaximumHeight(40);
+}
+
+void LensBar::SetupHomeLens()
+{
+  LensBarIcon* icon = new LensBarIcon("home.lens", PKGDATADIR"/lens-nav-home.svg");
+  icon->SetVisible(true);
+  icon->active = true;
+  icons_.push_back(icon);
+  layout_->AddView(icon, 0, nux::eCenter, nux::MINOR_SIZE_FULL);
+
+  icon->mouse_click.connect([&, icon] (int x, int y, unsigned long button, unsigned long keyboard) { SetActive(icon); });
+}
+
 void LensBar::AddLens(Lens::Ptr& lens)
 {
-  std::string id = lens->id;
-  std::string icon_hint = lens->icon_hint;
-
-  IconTexture* icon = new IconTexture(icon_hint.c_str(), 26);
-  icon->SetMinMaxSize(26, 26);
+  LensBarIcon* icon = new LensBarIcon(lens->id, lens->icon_hint);
   icon->SetVisible(lens->visible);
   lens->visible.changed.connect([icon](bool visible) { icon->SetVisible(visible); } );
+  icons_.push_back(icon);
   layout_->AddView(icon, 0, nux::eCenter, nux::eFix);
 
-  icon->mouse_click.connect([&, id] (int x, int y, unsigned long button, unsigned long keyboard) { lens_activated.emit(id); });
+  icon->mouse_click.connect([&, icon] (int x, int y, unsigned long button, unsigned long keyboard) { SetActive(icon); });
+}
+
+void LensBar::Activate(std::string id)
+{
+  for (auto icon: icons_)
+  {
+    if (icon->id == id)
+    {
+      SetActive(icon);
+      break;
+    }
+  }
 }
 
 long LensBar::ProcessEvent(nux::IEvent& ievent, long traverse_info, long event_info)
@@ -109,12 +124,20 @@
   nux::GetPainter().PushLayer(gfx_context, bg_layer_->GetGeometry(), bg_layer_);
   
   layout_->ProcessDraw(gfx_context, force_draw);
-  
+
   nux::GetPainter().PopBackground();
   
   gfx_context.PopClippingRectangle();
 }
 
+void LensBar::SetActive(LensBarIcon* activated)
+{
+  for (auto icon: icons_)
+    icon->active = icon == activated;
+
+  lens_activated.emit(activated->id);
+}
+
 // Keyboard navigation
 bool LensBar::AcceptKeyNavFocus()
 {
 
=== modified file 'plugins/unityshell/src/LensBar.h'
--- plugins/unityshell/src/LensBar.h	2011-08-18 15:42:39 +0000
+++ plugins/unityshell/src/LensBar.h	2011-08-24 12:31:11 +0000
@@ -20,6 +20,7 @@
 #define UNITY_LENS_BAR_H_
 
 #include <string>
+#include <vector>
 
 #include <NuxGraphics/GraphicsEngine.h>
 #include <Nux/Nux.h>
@@ -29,36 +30,45 @@
 
 #include "IconTexture.h"
 #include "Introspectable.h"
+#include "LensBarIcon.h"
 
 namespace unity
 {
 namespace dash
 {
 
-class LensBar : public nux::View, public unity::Introspectable
+  class LensBar : public nux::View, public unity::Introspectable
 {
   NUX_DECLARE_OBJECT_TYPE(LensBar, nux::View);
+  typedef std::vector<LensBarIcon*> LensIcons;
 
 public:
   LensBar();
   ~LensBar();
 
   void AddLens(Lens::Ptr& lens);
+  void Activate(std::string id);
 
   sigc::signal<void, std::string const&> lens_activated;
 
 private:
   void SetupBackground();
+  void SetupLayout();
+  void SetupHomeLens();
 
   long ProcessEvent(nux::IEvent& ievent, long traverse_info, long event_info);
   void Draw(nux::GraphicsEngine& gfx_context, bool force_draw);
   void DrawContent(nux::GraphicsEngine& gfx_context, bool force_draw);
 
+  void SetActive(LensBarIcon* icon);
+
   bool AcceptKeyNavFocus();
   const gchar* GetName();
   void AddProperties(GVariantBuilder* builder);
 
 private:
+  LensIcons icons_;
+
   nux::ColorLayer* bg_layer_;
   nux::HLayout* layout_;
 };
 
=== added file 'plugins/unityshell/src/LensBarIcon.cpp'
--- plugins/unityshell/src/LensBarIcon.cpp	1970-01-01 00:00:00 +0000
+++ plugins/unityshell/src/LensBarIcon.cpp	2011-08-24 12:31:11 +0000
@@ -0,0 +1,101 @@
+/*
+ * Copyright (C) 2010 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Neil Jagdish Patel <[e-mail]>
+ */
+
+#include "LensBarIcon.h"
+
+#include "config.h"
+
+namespace unity
+{
+namespace dash
+{
+
+NUX_IMPLEMENT_OBJECT_TYPE(LensBarIcon);
+
+LensBarIcon::LensBarIcon(std::string id_, std::string icon_hint)
+  : IconTexture(icon_hint.c_str(), 26)
+  , id(id_)
+  , active(false)
+  , inactive_opacity_(0.4f)
+{
+  SetMinimumWidth(26);
+  SetMaximumWidth(26);
+  SetMinimumHeight(40);
+  SetMaximumHeight(40);
+  SetOpacity(inactive_opacity_);
+
+  active.changed.connect(sigc::mem_fun(this, &LensBarIcon::OnActiveChanged));
+  mouse_enter.connect([&]
+(int, int, unsigned long, unsigned long) { QueueDraw(); });
+  mouse_leave.connect([&](int, int, unsigned long, unsigned long) { QueueDraw(); });
+}
+
+LensBarIcon::~LensBarIcon()
+{}
+
+void LensBarIcon::Draw(nux::GraphicsEngine& gfx_context, bool force_draw)
+{
+  nux::Geometry geo = GetGeometry();
+
+  gfx_context.PushClippingRectangle(geo);
+
+  nux::GetPainter().PaintBackground(gfx_context, geo);
+
+  if (!texture())
+    return;
+
+  float opacity = active || IsMouseInside() ? 1.0f : inactive_opacity_;
+  int width = 0, height = 0;
+  GetTextureSize(&width, &height);
+
+  nux::Color col(1.0f * opacity, 1.0f * opacity, 1.0f * opacity, opacity);
+  nux::TexCoordXForm texxform;
+  texxform.SetTexCoordType(nux::TexCoordXForm::OFFSET_COORD);
+  texxform.SetWrap(nux::TEXWRAP_CLAMP_TO_BORDER, nux::TEXWRAP_CLAMP_TO_BORDER);
+
+  gfx_context.QRP_1Tex(geo.x + ((geo.width - width) / 2),
+                      geo.y + ((geo.height - height) / 2),
+                      width,
+                      height,
+                      texture()->GetDeviceTexture(),
+                      texxform,
+                      col);
+  if (active)
+  {
+    nux::Geometry geo = GetGeometry();
+    int middle = geo.x + geo.width/2;
+    int size = 4;
+    int y = geo.y + 1;
+
+    nux::GetPainter().Draw2DTriangleColor(gfx_context,
+                                          middle - size, y,
+                                          middle, y + size,
+                                          middle + size, y,
+                                          nux::Color(1.0f, 1.0f, 1.0f, 1.0f));
+  }
+
+  gfx_context.PopClippingRectangle();
+}
+
+void LensBarIcon::OnActiveChanged(bool is_active)
+{
+  QueueDraw();
+}
+
+}
+}
 
=== added file 'plugins/unityshell/src/LensBarIcon.h'
--- plugins/unityshell/src/LensBarIcon.h	1970-01-01 00:00:00 +0000
+++ plugins/unityshell/src/LensBarIcon.h	2011-08-24 12:31:11 +0000
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2011 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Neil Jagdish Patel <[e-mail]>
+ */
+
+#ifndef UNITY_LENS_BAR_ICON_H_
+#define UNITY_LENS_BAR_ICON_H_
+
+#include <string>
+
+#include <NuxGraphics/GraphicsEngine.h>
+#include <Nux/Nux.h>
+#include <Nux/HLayout.h>
+#include <Nux/View.h>
+
+#include "IconTexture.h"
+
+namespace unity
+{
+namespace dash
+{
+
+class LensBarIcon : public IconTexture
+{
+  NUX_DECLARE_OBJECT_TYPE(LensBarIcon, IconTexture);
+public:
+  LensBarIcon(std::string id, std::string icon_hint);
+  ~LensBarIcon();
+
+  nux::Property<std::string> id;
+  nux::Property<bool> active;
+
+private:
+  void Draw(nux::GraphicsEngine& gfx_context, bool force_draw);
+  void OnActiveChanged(bool is_active);
+
+private:
+  const float inactive_opacity_;
+};
+
+}
+}
+#endif
 
=== modified file 'plugins/unityshell/src/LensView.cpp'
--- plugins/unityshell/src/LensView.cpp	2011-08-11 01:11:11 +0000
+++ plugins/unityshell/src/LensView.cpp	2011-08-24 12:31:11 +0000
@@ -42,6 +42,7 @@
   : nux::View(NUX_TRACKER_LOCATION)
   , search_string("")
   , filters_expanded(false)
+  , fix_renderering_id_(0)
 {}
 
 LensView::LensView(Lens::Ptr lens)
@@ -49,28 +50,27 @@
   , search_string("")
   , filters_expanded(false)
   , lens_(lens)
+  , initial_activation_(true)
+  , fix_renderering_id_(0)
 {
   SetupViews();
-
-  Categories::Ptr categories = lens_->categories;
-  categories->category_added.connect(sigc::mem_fun(this, &LensView::OnCategoryAdded));
-
-  Results::Ptr results = lens_->results;
-  results->result_added.connect(sigc::mem_fun(this, &LensView::OnResultAdded));
-  results->result_removed.connect(sigc::mem_fun(this, &LensView::OnResultRemoved));
-
-  Filters::Ptr filters = lens_->filters;
-  filters->filter_added.connect(sigc::mem_fun(this, &LensView::OnFilterAdded));
-  filters->filter_removed.connect(sigc::mem_fun(this, &LensView::OnFilterRemoved));
-
-  PlacesStyle::GetDefault()->columns_changed.connect(sigc::mem_fun(this, &LensView::OnColumnsChanged));
-
+  SetupCategories();
+  SetupResults();
+  SetupFilters();
+
+ PlacesStyle::GetDefault()->columns_changed.connect(sigc::mem_fun(this, &LensView::OnColumnsChanged));
+
+  lens_->connected.changed.connect([&](bool is_connected) { if (is_connected) initial_activation_ = true; });
   search_string.changed.connect([&](std::string const& search) { lens_->Search(search);  });
-  filters_expanded.changed.connect([&](bool expanded) { fscroll_view_->SetVisible(expanded); ubus_manager_.SendMessage(UBUS_PLACE_VIEW_QUEUE_DRAW); });
+  filters_expanded.changed.connect([&](bool expanded) { fscroll_view_->SetVisible(expanded); QueueRelayout(); });
+  active.changed.connect(sigc::mem_fun(this, &LensView::OnActiveChanged));
 }
 
 LensView::~LensView()
-{}
+{
+  if (fix_renderering_id_)
+    g_source_remove(fix_renderering_id_);
+}
 
 void LensView::SetupViews()
 {
@@ -100,6 +100,35 @@
   SetLayout(layout_);
 }
 
+void LensView::SetupCategories()
+{
+  Categories::Ptr categories = lens_->categories;
+  categories->category_added.connect(sigc::mem_fun(this, &LensView::OnCategoryAdded));
+
+  for (unsigned int i = 0; i < categories->count(); ++i)
+    OnCategoryAdded(categories->RowAtIndex(i));
+}
+
+void LensView::SetupResults()
+{
+  Results::Ptr results = lens_->results;
+  results->result_added.connect(sigc::mem_fun(this, &LensView::OnResultAdded));
+  results->result_removed.connect(sigc::mem_fun(this, &LensView::OnResultRemoved));
+
+  for (unsigned int i = 0; i < results->count(); ++i)
+    OnResultAdded(results->RowAtIndex(i));
+}
+
+void LensView::SetupFilters()
+{
+  Filters::Ptr filters = lens_->filters;
+  filters->filter_added.connect(sigc::mem_fun(this, &LensView::OnFilterAdded));
+  filters->filter_removed.connect(sigc::mem_fun(this, &LensView::OnFilterRemoved));
+
+  for (unsigned int i = 0; i < filters->count(); ++i)
+    OnFilterAdded(filters->FilterAtIndex(i));
+}
+
 void LensView::OnCategoryAdded(Category const& category)
 {
   std::string name = category.name;
@@ -128,6 +157,13 @@
   group->SetChildView(grid);
 
   scroll_layout_->AddView(group, 0);
+
+  Categories::Ptr categories = lens_->categories;
+  if (category.index + 1 == categories->count())
+  {
+    lens_->Search("---");
+    lens_->Search("");
+  }
 }
 
 void LensView::OnResultAdded(Result const& result)
@@ -162,6 +198,36 @@
 
   group->SetCounts(style->GetDefaultNColumns(), counts_[group]);
   group->SetVisible(counts_[group]);
+
+  QueueFixRenderering();
+}
+
+void LensView::QueueFixRenderering()
+{
+  if (fix_renderering_id_)
+    return;
+
+  fix_renderering_id_ = g_timeout_add(0, (GSourceFunc)FixRenderering, this);
+}
+
+gboolean LensView::FixRenderering(LensView* self)
+{
+  std::list<Area*> children = self->scroll_layout_->GetChildren();
+  std::list<Area*>::reverse_iterator rit;
+  bool found_one = false;
+
+  for (rit = children.rbegin(); rit != children.rend(); ++rit)
+  {
+    PlacesGroup* group = static_cast<PlacesGroup*>(*rit);
+
+    if (group->IsVisible())
+      group->SetDrawSeparator(found_one);
+
+    found_one = group->IsVisible();
+  }
+
+  self->fix_renderering_id_ = 0;
+  return FALSE;
 }
 
 void LensView::OnGroupExpanded(PlacesGroup* group)
@@ -196,6 +262,18 @@
   filter_bar_->RemoveFilter(filter);
 }
 
+void LensView::OnActiveChanged(bool is_active)
+{
+  if (is_active && initial_activation_)
+  {
+    /* We reset the lens for ourselves, in case this is a restart or something */
+    lens_->Search("");
+    initial_activation_ = false;
+  }
+
+  lens_->active = is_active;
+}
+
 long LensView::ProcessEvent(nux::IEvent& ievent, long traverse_info, long event_info)
 {
   return layout_->ProcessEvent(ievent, traverse_info, event_info);
 
=== modified file 'plugins/unityshell/src/LensView.h'
--- plugins/unityshell/src/LensView.h	2011-08-11 00:56:53 +0000
+++ plugins/unityshell/src/LensView.h	2011-08-24 12:31:11 +0000
@@ -54,11 +54,15 @@
 
   nux::Property<std::string> search_string;
   nux::Property<bool> filters_expanded;
+  nux::Property<bool> active;
 
   sigc::signal<void, std::string const&> uri_activated;
 
 private:
   void SetupViews();
+  void SetupCategories();
+  void SetupResults();
+  void SetupFilters();
 
   void OnCategoryAdded(Category const& category);
   void OnResultAdded(Result const& result);
@@ -68,6 +72,10 @@
   void OnColumnsChanged();
   void OnFilterAdded(Filter::Ptr filter);
   void OnFilterRemoved(Filter::Ptr filter);
+  void OnActiveChanged(bool is_active);
+  void QueueFixRenderering();
+
+  static gboolean FixRenderering(LensView* self);
 
   virtual long ProcessEvent(nux::IEvent& ievent, long traverse_info, long event_info);
   virtual void Draw(nux::GraphicsEngine& gfx_context, bool force_draw);
@@ -82,6 +90,7 @@
   Lens::Ptr lens_;
   CategoryGroups categories_;
   ResultCounts counts_;
+  bool initial_activation_;
 
   nux::HLayout* layout_;
   nux::ScrollView* scroll_view_;
@@ -89,6 +98,8 @@
   nux::ScrollView* fscroll_view_;
   nux::VLayout* fscroll_layout_;
   FilterBar* filter_bar_;
+
+  guint fix_renderering_id_;
 };
 
 
 
=== modified file 'plugins/unityshell/src/PlacesGroup.cpp'
--- plugins/unityshell/src/PlacesGroup.cpp	2011-08-19 15:17:30 +0000
+++ plugins/unityshell/src/PlacesGroup.cpp	2011-08-24 12:31:11 +0000
@@ -144,7 +144,7 @@
 {
   // Spaces are on purpose, want padding to be proportional to the size of the text
   // Bear with me, I'm trying something different :)
-  const gchar* temp = "    <big>%s</big>    ";
+  const gchar* temp = "    <span font_size='larger'>%s</span>    ";
   gchar* tmp = NULL;
   gchar* final = NULL;
   if (_cached_name != NULL)
 
=== modified file 'plugins/unityshell/src/PlacesStyle.cpp'
--- plugins/unityshell/src/PlacesStyle.cpp	2011-08-09 17:27:39 +0000
+++ plugins/unityshell/src/PlacesStyle.cpp	2011-08-24 12:31:11 +0000
@@ -143,6 +143,10 @@
   return GetHomeTileIconSize() + (_text_height * 4);
 }
 
+int PlacesStyle::GetTextLineHeight()
+{
+  return _text_height;
+}
 
 nux::BaseTexture* PlacesStyle::GetDashBottomTile()
 {
 
=== modified file 'plugins/unityshell/src/PlacesStyle.h'
--- plugins/unityshell/src/PlacesStyle.h	2011-08-09 17:27:39 +0000
+++ plugins/unityshell/src/PlacesStyle.h	2011-08-24 12:31:11 +0000
@@ -45,6 +45,8 @@
   int GetHomeTileWidth();
   int GetHomeTileHeight();
 
+  int GetTextLineHeight();
+
   nux::BaseTexture* GetDashBottomTile();
   nux::BaseTexture* GetDashRightTile();
   nux::BaseTexture* GetDashCorner();
 
=== modified file 'plugins/unityshell/src/ResultRendererTile.cpp'
--- plugins/unityshell/src/ResultRendererTile.cpp	2011-08-18 09:14:53 +0000
+++ plugins/unityshell/src/ResultRendererTile.cpp	2011-08-24 12:31:11 +0000
@@ -27,6 +27,8 @@
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>
 
+#include <UnityCore/GLibWrapper.h>
+
 #include "IconLoader.h"
 #include "IconTexture.h"
 #include "PlacesStyle.h"
@@ -410,26 +412,34 @@
 
     PangoLayout*          layout     = NULL;
     PangoFontDescription* desc       = NULL;
-    PangoContext*         pangoCtx   = NULL;
+    PangoContext*         pango_context   = NULL;
     GdkScreen*            screen     = gdk_screen_get_default();    // not ref'ed
-
+    glib::String          font;
+    int                   dpi = -1;
+    
+    g_object_get(gtk_settings_get_default(), "gtk-font-name", &font, NULL);
+    g_object_get(gtk_settings_get_default(), "gtk-xft-dpi", &dpi, NULL);
 
     cairo_set_font_options(cr, gdk_screen_get_font_options(screen));
     layout = pango_cairo_create_layout(cr);
-    desc = pango_font_description_from_string("Ubuntu 10");
+    desc = pango_font_description_from_string(font.Value());
 
     pango_layout_set_font_description(layout, desc);
-
     pango_layout_set_alignment(layout, PANGO_ALIGN_CENTER);
+
+    pango_layout_set_wrap(layout, PANGO_WRAP_WORD_CHAR);
+    pango_layout_set_ellipsize(layout, PANGO_ELLIPSIZE_START);
+    pango_layout_set_width(layout, (style->GetTileWidth() - 12)* PANGO_SCALE);
+    pango_layout_set_height(layout, -2);
+
     pango_layout_set_markup(layout, text.c_str(), -1);
-    pango_layout_set_width(layout, (style->GetTileWidth() - 12)* PANGO_SCALE);
-
-    pango_layout_set_height(layout, 2);
-    pangoCtx = pango_layout_get_context(layout);  // is not ref'ed
-    pango_cairo_context_set_font_options(pangoCtx,
+    
+    pango_context = pango_layout_get_context(layout);  // is not ref'ed
+    pango_cairo_context_set_font_options(pango_context,
                                          gdk_screen_get_font_options(screen));
-    // use some default DPI-value
-    pango_cairo_context_set_resolution(pangoCtx, 96.0f);
+    pango_cairo_context_set_resolution(pango_context,
+                                       dpi == -1 ? 96.0f : dpi/(float) PANGO_SCALE);
+    pango_layout_context_changed(layout);
 
     cairo_set_operator(cr, CAIRO_OPERATOR_CLEAR);
     cairo_paint(cr);
@@ -437,8 +447,6 @@
     cairo_set_operator(cr, CAIRO_OPERATOR_OVER);
     cairo_set_source_rgba(cr, 1.0f, 1.0f, 1.0f, 1.0f);
 
-    pango_layout_context_changed(layout);
-
     cairo_move_to(cr, 0.0f, 0.0f);
     pango_cairo_show_layout(cr, layout);
 
 
=== modified file 'plugins/unityshell/src/StaticCairoText.cpp'
--- plugins/unityshell/src/StaticCairoText.cpp	2011-08-05 15:17:12 +0000
+++ plugins/unityshell/src/StaticCairoText.cpp	2011-08-24 12:31:11 +0000
@@ -320,6 +320,7 @@
   surface = cairo_image_surface_create(CAIRO_FORMAT_A1, 1, 1);
   cr = cairo_create(surface);
   cairo_set_font_options(cr, gdk_screen_get_font_options(screen));
+  
   layout = pango_cairo_create_layout(cr);
   desc = pango_font_description_from_string(font);
   pango_layout_set_font_description(layout, desc);
 
=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2011-08-24 02:25:07 +0000
+++ plugins/unityshell/src/unityshell.cpp	2011-08-24 12:31:11 +0000
@@ -1371,6 +1371,7 @@
   gdk_screen_get_monitor_geometry (scr, primary_monitor, &rect);
   _primary_monitor = rect;
 
+
   wt->SetWindowSize(rect.width, rect.height);
 
   lCurGeom = launcherWindow->GetGeometry();
 
=== modified file 'plugins/unityshell/src/unityshell.h'
--- plugins/unityshell/src/unityshell.h	2011-08-22 03:06:14 +0000
+++ plugins/unityshell/src/unityshell.h	2011-08-24 12:31:11 +0000
@@ -31,6 +31,7 @@
 
 #include "Introspectable.h"
 #include "DashController.h"
+#include "FontSettings.h"
 #include "Launcher.h"
 #include "LauncherController.h"
 #include "PanelController.h"
@@ -77,6 +78,7 @@
 
 #include <compiztoolbox/compiztoolbox.h>
 
+using unity::FontSettings;
 using namespace unity::switcher;
 using namespace unity::dash;
 using unity::UBusManager;
@@ -208,6 +210,7 @@
   static void OnLauncherStartKeyNav(GVariant* data, void* value);
   static void OnLauncherEndKeyNav(GVariant* data, void* value);
 
+  FontSettings            font_settings_;
   Launcher*               launcher;
   LauncherController*     controller;
   DashController::Ptr     dashController;
 
=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2011-08-16 11:34:48 +0000
+++ tests/CMakeLists.txt	2011-08-24 12:31:11 +0000
@@ -95,6 +95,8 @@
                 ${UNITY_SRC}/FilterGenreButton.cpp
                 ${UNITY_SRC}/FilterGenreWidget.cpp
                 ${UNITY_SRC}/FilterBar.cpp
+                ${UNITY_SRC}/FontSettings.cpp
+                ${UNITY_SRC}/FontSettings.h
                 ${UNITY_SRC}/IMTextEntry.cpp
                 ${UNITY_SRC}/IMTextEntry.h
                 ${UNITY_SRC}/PlacesHomeView.cpp
@@ -122,6 +124,8 @@
                 ${UNITY_SRC}/Introspectable.h
                 ${UNITY_SRC}/LensBar.cpp
                 ${UNITY_SRC}/LensBar.h
+                ${UNITY_SRC}/LensBarIcon.cpp
+                ${UNITY_SRC}/LensBarIcon.h
                 ${UNITY_SRC}/LensView.cpp
                 ${UNITY_SRC}/LensView.h
                 ${UNITY_SRC}/PreviewApplications.cpp
@@ -270,6 +274,8 @@
                 ${UNITY_SRC}/FilterMultiRangeButton.cpp
                 ${UNITY_SRC}/FilterMultiRangeWidget.cpp
                 ${UNITY_SRC}/DashStyle.cpp
+                ${UNITY_SRC}/PlacesStyle.cpp
+                ${UNITY_SRC}/PlacesStyle.h
                 )
 add_dependencies(test-filters unity-core-${UNITY_API_VERSION})
 
@@ -286,6 +292,8 @@
                 ${UNITY_SRC}/FilterGenreWidget.cpp
                 ${UNITY_SRC}/FilterBar.cpp
                 ${UNITY_SRC}/DashStyle.cpp
+                ${UNITY_SRC}/PlacesStyle.cpp
+                ${UNITY_SRC}/PlacesStyle.h
                 )
 add_dependencies(test-filter-bar unity-core-${UNITY_API_VERSION})
 
 
=== modified file 'tests/standalone_dash.cpp'
--- tests/standalone_dash.cpp	2011-08-22 13:48:47 +0000
+++ tests/standalone_dash.cpp	2011-08-24 12:31:11 +0000
@@ -27,6 +27,7 @@
 #include <NuxCore/Logger.h>
 
 #include "BGHash.h"
+#include "FontSettings.h"
 #include "DashView.h"
 #include "PlacesSettings.h"
 
@@ -91,6 +92,7 @@
   gtk_init (&argc, &argv);
 
   unity::BGHash bghash;
+  unity::FontSettings font_settings;
 
   nux::NuxInitialize(0);
   nux::logging::configure_logging(::getenv("UNITY_LOG_SEVERITY"));