Merge lp:~azzar1/unity/filters-fixes into lp:unity

[Andrea Azzarone]

Dash filters fixes.

First of all don't worry about the 3810 lines of diff because this is a update-coding-style branch too.

* Coding Style
  - Moves filters stuff in unity::dash:: namespace
  - Removes space between function name and (.
  - [Pointers] Place the asterisk adjacent to the type.
  - Adds UNITYSHELL_ prefix to each #define guard.
  - Uses nullptr

* Bug #838901

* Bug #841864
  - There is already a merge proposal [2] but it has too many conflicts so I've created my own patch with a quite different solution.
  - I've created a unity::Dash::FilterAllButton class to remove code duplication and to handle as clean as possible the "All" button design.
  - I've slightly changed UnityCore/RatingsFilter.cpp to make it working properly. Make check is ok after the change.

* Bug #841870
  - Sadly Area::SetVisible(bool) doesn't work with nux::Layout (by design and I've no idea why it is so...). So the best way to hide/unhide a nux::layout is to add/remove the layout to/from the parten layout.
  - When we remove the layout, we add a spacelayout to draw the separator line properly.

* Any other
 - I had this visual bug using unity from trunk [3]. Fixed it too.
 - I could not explain this...
      class FilterRatingsButton : public nux::Button, public unity::FilterWidget {
   Now it is:
      class FilterRatingsButton : public nux::ToggleButton {

[1] https://code.launchpad.net/~yeganeh/unity/fix-for-838901
[2] https://code.launchpad.net/~yeganeh/unity/fix-for-841864
[3] http://ubuntuone.com/7UM17vk7oa7m1paFbkKTfS

[Michal Hruby (mhr3)]

Did you make sure this doesn't change the way the dbus signals are sent to lenses? (from looking at the changes it shouldn't though)

review: Needs Information

[Andrea Azzarone (azzar1)]

> Did you make sure this doesn't change the way the dbus signals are sent to
> lenses? (from looking at the changes it shouldn't though)

There's a TestRatingsFilter (or something like that) and it's ok after the changes.

The changes too UnityCore/RatingsFilter.cpp makes sure that after calling ::Clear the ratings is really setted to 0 (how happens with the other filters). The canges make sure that setting the ratings too 0 (or calling ::Clear) the filtering property is "setted" (quotation marks because it'a read only property) to false.

[Andrea Azzarone (azzar1)]

*The changes to

[Andrea Azzarone (azzar1)]

Too many mistakes :/

> Did you make sure this doesn't change the way the dbus signals are sent to
> lenses? (from looking at the changes it shouldn't though)

There's a TestRatingsFilter (or something like that) and it's ok after the changes.

The changes to UnityCore/RatingsFilter.cpp make sure that after calling ::Clear the ratings property is really setted to 0 (how happens with the other filters). And the canges make sure that setting the ratings property to 0 (or calling ::Clear) the filtering property is "setted" (quotation marks because it'a read only property) to false.

[Tim Penhey (thumper)]

> - There is already a merge proposal [2] but it has too many conflicts so I've created my own patch with
> a quite different solution.

How is your solution different? Is there a good reason not to start with the existing proposal that gord had reviewed?

review: Needs Information

[Andrea Azzarone (azzar1)]

> > - There is already a merge proposal [2] but it has too many conflicts so
> I've created my own patch with
> > a quite different solution.
>
> How is your solution different? Is there a good reason not to start with the
> existing proposal that gord had reviewed?

It's quite similar. The existing proposal uses a base class with an all button to remove duplicate in all the *widget.cpp files. My branch uses an all button class that is added using nux layout to the widget.

P.S. There was too many conflicts. I asked him to resolve them but I didn't get an answer.

[Tim Penhey (thumper)]

Another branch that really shouldn't have mixed style changes with real changes.

Use const& params when passing objects around, even smart pointers.

  void FilterAllButton::SetFilter(Filter::Ptr const& filter)

When would this method be called?

I know that you just moved the code, but FilterBasicButton.cpp,
FilterBasicButton::ComputeContentSize, should just set the cached_geometry_
inside the if statement, and reuse "geo".

Is there a reason we aren't using the cached_geometry_ in the Draw method?
Seems weird to cache it and not use it. Gah... and GetGeometry() is called
multiple times in Draw.

+1 on adding the missing & to const std::string. Extra brownie points for
making them "std::string const&" :-)

Inside FilterExpanderLabel::SetContents, you change the behaviour slightly.
Is this ever called more than once for any given object?

By calling SinkReference you are changing it from being unowned, to just
having a reference count of 1. When it is added to the layout, it gets a
reference count of 2. Normally when the layout is destroyed, it would
dereference. This is how the old code path handled the cleanup. The
SetContents method adds the unref, but doesn't remove the old contents from
the layout. However all of this is moot if this method should only ever be
called once.

Why add a SpaceLayout that isn't added to anything?

Also, we really shouldn't be adding Reference/UnReference/SinkReference calls
anywhere. Ideally you'd use a nux::ObjectPtr<xxx> to handle this.

Hmm... things becoming clearer.

You have a bug in your removal of the space layout.
  if (space_ and space_->IsChildOf(space_))
should be
  if (space_ and space_->IsChildOf(layout_))

> layout_->AddView(space_, 1);
I hate magic numbers in code, what does the "1" do?

If you changed the space_ and contents_ members to be nux::ObjectPtr wrappers,
you wouldn't need the the UnReference/SinkReference calls.

The SetContent method could then use the Adopt method to take ownership.

/me sighs

> nux::View* FilterFactory::WidgetForFilter(Filter::Ptr filter)

Please pass the filter by const&

This code will blow up if the filter type is not understood by trying to call
a method on a dynamic_cast of a nullptr.

Firstly, don't use nux::View* for the temporary. Use a FilterWidget* and call
it, oh maybe, widget. You also don't need to static_cast up an inheritance
hierarchy, you can just assign. Also, by doing this, you don't need the
dynamic_cast either.

  FilterWidget* widget = nullptr;
  if (filter_type == renderer_type_check_options)
  {
    widget = new FilterGenre(NUX_TRACKER_LOCATION);
  }
  else if (filter_type == renderer_type_ratings)
  {
    widget = new FilterRatingsWidget(NUX_TRACKER_LOCATION);
  }
  else if (filter_type == renderer_type_multirange)
  {
    widget = new FilterMultiRange(NUX_TRACKER_LOCATION);
  }
  else if (filter_type == renderer_type_radio_options)
  {
    widget = new FilterGenre(NUX_TRACKER_LOCATION);
  }
  else
  {
    LOG_WARNING(logger) << "Do not understand filter of type \""
                        << filter_type
                        << "\"";
  }

  if (widget)
    widget->SetFilter(filter);

  return widget;

> FilterFactory.h

A...

review: Needs Fixing

[Andrea Azzarone (azzar1)]

> Another branch that really shouldn't have mixed style changes with real
> changes.
>
> Use const& params when passing objects around, even smart pointers.
>
> void FilterAllButton::SetFilter(Filter::Ptr const& filter)

Done.

>
> When would this method be called?

Every time the associated *Widget got another filter.

>
> I know that you just moved the code, but FilterBasicButton.cpp,
> FilterBasicButton::ComputeContentSize, should just set the cached_geometry_
> inside the if statement, and reuse "geo".

Done.

>
> Is there a reason we aren't using the cached_geometry_ in the Draw method?
> Seems weird to cache it and not use it. Gah... and GetGeometry() is called
> multiple times in Draw.

We're caching cached_geometry_ to not invalidate active_ and normal_ (?) every single time.
But I think that it's legal to use cached_geometry_ in the Draw method too... Maybe we can
ask Jay.

>
> +1 on adding the missing & to const std::string. Extra brownie points for
> making them "std::string const&" :-)
>
> Inside FilterExpanderLabel::SetContents, you change the behaviour slightly.

Because SetVisible doesn't work on a nux::layout ;)

> Is this ever called more than once for any given object?

It should be called just the first time.

>
> By calling SinkReference you are changing it from being unowned, to just
> having a reference count of 1. When it is added to the layout, it gets a
> reference count of 2. Normally when the layout is destroyed, it would
> dereference. This is how the old code path handled the cleanup. The
> SetContents method adds the unref, but doesn't remove the old contents from
> the layout. However all of this is moot if this method should only ever be
> called once.
>
> Why add a SpaceLayout that isn't added to anything?

It was necessary to add an extra padding during the collapse state. I've found a
cleaner solution ;)

>
> Also, we really shouldn't be adding Reference/UnReference/SinkReference calls
> anywhere. Ideally you'd use a nux::ObjectPtr<xxx> to handle this.

Done ;)

>
> Hmm... things becoming clearer.
>
> You have a bug in your removal of the space layout.
> if (space_ and space_->IsChildOf(space_))
> should be
> if (space_ and space_->IsChildOf(layout_))
>
> > layout_->AddView(space_, 1);
> I hate magic numbers in code, what does the "1" do?
>

No longer needed. I've just removed space_;

> If you changed the space_ and contents_ members to be nux::ObjectPtr wrappers,
> you wouldn't need the the UnReference/SinkReference calls.
>
> The SetContent method could then use the Adopt method to take ownership.

Done.

>
> /me sighs
>
> > nux::View* FilterFactory::WidgetForFilter(Filter::Ptr filter)
>
> Please pass the filter by const&

Done.

>
> This code will blow up if the filter type is not understood by trying to call
> a method on a dynamic_cast of a nullptr.

Done.

>
> Firstly, don't use nux::View* for the temporary. Use a FilterWidget* and call
> it, oh maybe, widget. You also don't need to static_cast up an inheritance
> hierarchy, you can just assign. Also, by doing this, you don't need the
> dynamic_cast either.
>
> FilterWidget* widget = nullptr;
> if (filter_typ...

[Tim Penhey (thumper)]

The only change is to make the FilterWidget inherit from nux::View, then the FilterExpanderLabel inherits from FilterWidget. This will remove the multiple inheritance, and the need for the dynamic_cast in the factory method.

review: Needs Fixing

[Andrea Azzarone (azzar1)]

> The only change is to make the FilterWidget inherit from nux::View, then the
> FilterExpanderLabel inherits from FilterWidget. This will remove the multiple
> inheritance, and the need for the dynamic_cast in the factory method.

Done.

[Michal Hruby (mhr3)]

Works well with latest libunity.

review: Approve (lens-integration)

[Tim Penhey (thumper)]

review: Approve

=== modified file 'UnityCore/RatingsFilter.cpp'
--- UnityCore/RatingsFilter.cpp	2011-08-05 16:06:01 +0000
+++ UnityCore/RatingsFilter.cpp	2012-01-11 09:37:33 +0000
@@ -41,7 +41,7 @@
 
 void RatingsFilter::Clear()
 {
-  UpdateState(0.0f, false);
+  rating = 0.0f;
 }
 
 void RatingsFilter::Update(Filter::Hints& hints)
@@ -61,13 +61,15 @@
 
 void RatingsFilter::OnRatingChanged(float new_value)
 {
-  UpdateState(new_value, true);
+  UpdateState(new_value);
 }
 
-void RatingsFilter::UpdateState(float raw_rating, bool raw_filtering)
+void RatingsFilter::UpdateState(float raw_rating)
 {
   if (!IsValid())
     return;
+    
+  bool new_filtering = raw_rating > 0.0f;
 
   GVariantBuilder b;
   g_variant_builder_init(&b, G_VARIANT_TYPE("a{sv}"));
@@ -79,7 +81,7 @@
                       g_variant_builder_end(&b));
   dee_model_set_value(model_, iter_,
                       FilterColumn::FILTERING,
-                      g_variant_new("b", raw_filtering ? TRUE : FALSE));
+                      g_variant_new("b", new_filtering ? TRUE : FALSE));
   IgnoreChanges(false);
 
   filtering.EmitChanged(filtering);

=== modified file 'UnityCore/RatingsFilter.h'
--- UnityCore/RatingsFilter.h	2011-07-28 20:56:33 +0000
+++ UnityCore/RatingsFilter.h	2012-01-11 09:37:33 +0000
@@ -43,7 +43,7 @@
 
 private:
   void OnRatingChanged(float new_value);
-  void UpdateState(float rating, bool filtering);
+  void UpdateState(float new_rating);
 };
 
 }

=== added file 'manual-tests/AllButton.txt'
--- manual-tests/AllButton.txt	1970-01-01 00:00:00 +0000
+++ manual-tests/AllButton.txt	2012-01-11 09:37:33 +0000
@@ -0,0 +1,40 @@
+Test Filter "All" Button
+========================
+These tests show that the dash "All" button works well.
+
+
+Test "All" Button 1
+-------------------
+
+#. Just after the login open the "Filter results".
+
+Outcome
+  "All" should be selected by default in every filter category.
+  
+Test "All" Button 2
+-------------------
+
+#. Make sure the "All" button is selected.
+#. Try to activate it.
+
+Outcome
+  Click on it should do nothing.
+  
+
+Test "All" Button 3
+-------------------
+
+#. Make sure the "All" button is selected.
+#. Select another item in the filter category.
+
+Outcome:
+  The all button should automatically toggle to the un-selected state.
+
+Test "All" Button 4
+-------------------
+
+#. Make sure the one or more items is selected in a filter category.
+#. Deselect all items.
+
+Outcome:
+  The all button should automatically toggle to the selected state.

=== added file 'manual-tests/Filters.txt'
--- manual-tests/Filters.txt	1970-01-01 00:00:00 +0000
+++ manual-tests/Filters.txt	2012-01-11 09:37:33 +0000
@@ -0,0 +1,26 @@
+Test Expand/Collapse Filters
+========================
+This test shows that the expand/collapse arrow of a filter category
+header works well.
+
+#. Open the dash.
+#. Make sure that a collapse arrow is shown adjacent to every
+   filter category header.
+#. Click on it.
+#. The filter category should collapse.
+#. Make sure that an expand arrow is shown ajacent to every filter
+   category header.
+#. Click on it (again).
+#. The filter category should expand.
+
+
+Test no-over-state effect
+=========================
+This test show that filter buttons in the Dash do not have a mouse
+over state.
+
+#. Open the dash.
+#. Move the mouse on filter buttons.
+
+Outcome
+  The filter buttons have no mouseover state effect.

=== modified file 'plugins/unityshell/resources/dash-widgets.json'
--- plugins/unityshell/resources/dash-widgets.json	2011-10-10 16:45:13 +0000
+++ plugins/unityshell/resources/dash-widgets.json	2012-01-11 09:37:33 +0000
@@ -23,9 +23,9 @@
 
   "button-icon": {
     "color"          : ["#ffffff", "#FFFFFF", "#FFFFFF", "#FFFFFF", "#FFFFFF"],
-    "opacity"        : [      1.0,       1.0,       0.8,       0.8,       0.8],
-    "overlay-opacity": [     0.30,      0.48,      0.45,      0.45,      0.45],
-    "overlay-mode"   : [ "normal","multiply",  "normal",  "normal",  "normal"],
+    "opacity"        : [      1.0,       1.0,       1.0,       0.8,       0.8],
+    "overlay-opacity": [     0.30,      0.48,      0.48,      0.45,      0.45],
+    "overlay-mode"   : [ "normal","multiply",  "multiply",  "normal",  "normal"],
     "blur-size"      : [        5,         0,         0,         0,         0]},
 
   "icon-only"        : {
@@ -46,8 +46,8 @@
     "text-size"      : 1.0,
     "text-color"     : ["#ffffff", "#ffffff", "#ffffff", "#ffffff", "#ffffff"],
     "text-opacity"   : [      1.0,       1.0,       1.0,       1.0,       1.0], 
-    "fill-color"     : ["#FFFFFF", "#000000", "#ffffff", "#000000", "#000000"],
-    "fill-opacity"   : [      0.25,       0.0,      0.25,       0.0,       0.0],
+    "fill-color"     : ["#FFFFFF", "#000000", "#000000", "#000000", "#000000"],
+    "fill-opacity"   : [      0.25,       0.0,      0.0,       0.0,       0.0],
     "overlay-opacity": [      0.1,       0.1,       0.1,       0.0,       0.0],
     "overlay-mode"   : [ "normal",  "normal",  "normal",  "normal",  "normal"],
     "blur-size"      : [        1,         1,         1,         0,         0]},

=== added file 'plugins/unityshell/src/FilterAllButton.cpp'
--- plugins/unityshell/src/FilterAllButton.cpp	1970-01-01 00:00:00 +0000
+++ plugins/unityshell/src/FilterAllButton.cpp	2012-01-11 09:37:33 +0000
@@ -0,0 +1,71 @@
+// -*- Mode: C++; indent-tabs-mode: nil; tab-width: 2 -*-
+/*
+ * Copyright 2011 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser 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 warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the applicable version of the GNU Lesser General Public
+ * License for more details.
+ *
+ * You should have received a copy of both the GNU Lesser General Public
+ * License version 3 along with this program.  If not, see
+ * <http://www.gnu.org/licenses/>
+ *
+ * Authored by: Andrea Azzarone <[e-mail]>
+ *
+ */
+
+
+#include <glib.h>
+#include <glib/gi18n-lib.h>
+
+#include "FilterAllButton.h"
+
+namespace unity
+{
+namespace dash
+{
+
+FilterAllButton::FilterAllButton(NUX_FILE_LINE_DECL)
+ : FilterBasicButton(_("All"), NUX_FILE_LINE_PARAM)
+{
+  SetActive(true);
+  SetInputEventSensitivity(false);
+
+  state_change.connect(sigc::mem_fun(this, &FilterAllButton::OnStateChanged));
+}
+
+FilterAllButton::~FilterAllButton()
+{
+}
+
+void FilterAllButton::SetFilter(Filter::Ptr const& filter)
+{
+  if (filtering_connection_.connected())
+    filtering_connection_.disconnect();
+
+  filter_ = filter;
+  OnFilteringChanged(filter_->filtering); // Evil hack ;)
+
+  filtering_connection_ = filter_->filtering.changed.connect(sigc::mem_fun(this, &FilterAllButton::OnFilteringChanged));
+}
+
+void FilterAllButton::OnStateChanged(nux::View* view)
+{
+  if (filter_ and Active())
+    filter_->Clear();
+}
+
+void FilterAllButton::OnFilteringChanged(bool filtering)
+{
+  SetActive(!filtering);
+  SetInputEventSensitivity(filtering);
+}
+
+} // namespace dash
+} // namespace unity

=== added file 'plugins/unityshell/src/FilterAllButton.h'
--- plugins/unityshell/src/FilterAllButton.h	1970-01-01 00:00:00 +0000
+++ plugins/unityshell/src/FilterAllButton.h	2012-01-11 09:37:33 +0000
@@ -0,0 +1,55 @@
+// -*- Mode: C++; indent-tabs-mode: nil; tab-width: 2 -*-
+/*
+ * Copyright 2011 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser 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 warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the applicable version of the GNU Lesser General Public
+ * License for more details.
+ *
+ * You should have received a copy of both the GNU Lesser General Public
+ * License version 3 along with this program.  If not, see
+ * <http://www.gnu.org/licenses/>
+ *
+ * Authored by: Andrea Azzarone <[e-mail]>
+ *
+ */
+
+#ifndef UNITYSHELL_FILTERALLBUTTON_H
+#define UNITYSHELL_FILTERALLBUTTON_H
+
+#include <sigc++/connection.h>
+
+#include "FilterBasicButton.h"
+
+namespace unity
+{
+namespace dash
+{
+
+class FilterAllButton : public FilterBasicButton
+{
+public:
+   FilterAllButton(NUX_FILE_LINE_PROTO);
+   ~FilterAllButton();
+
+   void SetFilter(Filter::Ptr const& filter);
+
+private:
+  void OnFilteringChanged(bool filtering);
+  void OnStateChanged(nux::View* view);
+
+  Filter::Ptr filter_;
+  sigc::connection filtering_connection_;
+};
+
+} // namespace dash
+} // namespace unity
+
+#endif // UNITYSHELL_FILTERALLBUTTON_H
+

=== modified file 'plugins/unityshell/src/FilterBar.cpp'
--- plugins/unityshell/src/FilterBar.cpp	2011-10-19 16:28:06 +0000
+++ plugins/unityshell/src/FilterBar.cpp	2012-01-11 09:37:33 +0000
@@ -21,83 +21,94 @@
 
 #include <Nux/Nux.h>
 #include <Nux/VLayout.h>
+#include <NuxCore/Logger.h>
 
 #include "FilterBar.h"
 #include "FilterFactory.h"
 
 namespace unity
 {
+namespace dash
+{
+namespace
+{
+
+nux::logging::Logger logger("unity.dash.filterbar");
+
+}
 
 NUX_IMPLEMENT_OBJECT_TYPE(FilterBar);
 
-  FilterBar::FilterBar(NUX_FILE_LINE_DECL)
-      : View (NUX_FILE_LINE_PARAM) {
-    // TODO - does the filterbar associate itself with a model of some sort?
-    // does libunity provide a Lens.Filters model or something that we can update on?
-    // don't want to associate a Filterbar with just a lens model, its a filter bar not a
-    // lens parser
-    Init ();
-  }
-
-  FilterBar::~FilterBar()
-  {
-  }
-
-  void FilterBar::Init () {
-    nux::LinearLayout *layout = new nux::VLayout (NUX_TRACKER_LOCATION);
-    layout->SetSpaceBetweenChildren(12);
-    SetLayout (layout);
-  }
-
-  void FilterBar::SetFilters (dash::Filters::Ptr filters)
-  {
-    filters_ = filters;
-  }
-
-  void FilterBar::AddFilter (dash::Filter::Ptr filter) {
-    if (filter_map_.count (filter) > 0) {
-      g_warning ("Attempting to add a filter that has already been added");
-      return;
-    }
-
-    nux::View *filter_view = factory_.WidgetForFilter (filter);
-    filter_map_[filter] = filter_view;
-    GetLayout()->AddView(filter_view, 0, nux::MINOR_POSITION_LEFT, nux::MINOR_SIZE_FULL);
-  }
-
-  void FilterBar::RemoveFilter (dash::Filter::Ptr filter) {
-    for (auto iter: filter_map_)
+FilterBar::FilterBar(NUX_FILE_LINE_DECL)
+  : View(NUX_FILE_LINE_PARAM)
+{
+  // TODO - does the filterbar associate itself with a model of some sort?
+  // does libunity provide a Lens.Filters model or something that we can update on?
+  // don't want to associate a Filterbar with just a lens model, its a filter bar not a
+  // lens parser
+  Init();
+}
+
+FilterBar::~FilterBar()
+{
+}
+
+void FilterBar::Init()
+{
+  nux::LinearLayout* layout = new nux::VLayout(NUX_TRACKER_LOCATION);
+  layout->SetSpaceBetweenChildren(12);
+  SetLayout(layout);
+}
+
+void FilterBar::SetFilters(Filters::Ptr const& filters)
+{
+  filters_ = filters;
+}
+
+void FilterBar::AddFilter(Filter::Ptr const& filter)
+{
+  if (filter_map_.count(filter) > 0)
+  {
+    LOG_WARN(logger) << "Attempting to add a filter that has already been added";
+    return;
+  }
+
+  nux::View* filter_view = factory_.WidgetForFilter(filter);
+  filter_map_[filter] = filter_view;
+  GetLayout()->AddView(filter_view, 0, nux::MINOR_POSITION_LEFT, nux::MINOR_SIZE_FULL);
+}
+
+void FilterBar::RemoveFilter(Filter::Ptr const& filter)
+{
+  for (auto iter: filter_map_)
+  {
+    if (iter.first->id == filter->id)
     {
-      if (iter.first->id == filter->id)
-      {
-        nux::View *filter_view = iter.second;
-        filter_map_.erase (filter_map_.find(iter.first));
-        GetLayout()->RemoveChildObject(filter_view);
-        break;
-      }
+      nux::View* filter_view = iter.second;
+      filter_map_.erase(filter_map_.find(iter.first));
+      GetLayout()->RemoveChildObject(filter_view);
+      break;
     }
   }
-
-  void FilterBar::Draw(nux::GraphicsEngine& GfxContext, bool force_draw) {
-    nux::Geometry geo = GetGeometry();
-
-    GfxContext.PushClippingRectangle(geo);
-    nux::GetPainter().PaintBackground(GfxContext, geo);
-    GfxContext.PopClippingRectangle();
-  }
-
-  void FilterBar::DrawContent(nux::GraphicsEngine& GfxContext, bool force_draw) {
-    GfxContext.PushClippingRectangle(GetGeometry());
-
-    GetLayout()->ProcessDraw(GfxContext, force_draw);
-
-    GfxContext.PopClippingRectangle();
-  }
-
-  void FilterBar::PostDraw(nux::GraphicsEngine& GfxContext, bool force_draw) {
-    nux::View::PostDraw(GfxContext, force_draw);
-  }
-
-
-}
+}
+
+void FilterBar::Draw(nux::GraphicsEngine& GfxContext, bool force_draw)
+{
+  nux::Geometry const& geo = GetGeometry();
+
+  GfxContext.PushClippingRectangle(geo);
+  nux::GetPainter().PaintBackground(GfxContext, geo);
+  GfxContext.PopClippingRectangle();
+}
+
+void FilterBar::DrawContent(nux::GraphicsEngine& GfxContext, bool force_draw)
+{
+  GfxContext.PushClippingRectangle(GetGeometry());
+  GetLayout()->ProcessDraw(GfxContext, force_draw);
+  GfxContext.PopClippingRectangle();
+}
+
+
+} // namespace dash
+} // namespace unity
 

=== modified file 'plugins/unityshell/src/FilterBar.h'
--- plugins/unityshell/src/FilterBar.h	2011-10-11 18:18:13 +0000
+++ plugins/unityshell/src/FilterBar.h	2012-01-11 09:37:33 +0000
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef FILTERBAR_H
-#define FILTERBAR_H
+#ifndef UNITYSHELL_FILTERBAR_H
+#define UNITYSHELL_FILTERBAR_H
 
 #include <Nux/View.h>
 
@@ -29,32 +29,37 @@
 
 #include "FilterFactory.h"
 
-namespace unity {
-
-  class FilterBar : public nux::View
-  {
-    NUX_DECLARE_OBJECT_TYPE(FilterBar, nux::View);
-  public:
-    FilterBar(NUX_FILE_LINE_PROTO);
-    ~FilterBar();
-
-    void SetFilters (dash::Filters::Ptr filters);
-
-    void AddFilter (dash::Filter::Ptr filter);
-    void RemoveFilter (dash::Filter::Ptr filter);
-
-  protected:
-    virtual void Draw(nux::GraphicsEngine& GfxContext, bool force_draw);
-    virtual void DrawContent(nux::GraphicsEngine& GfxContext, bool force_draw);
-    virtual void PostDraw(nux::GraphicsEngine& GfxContext, bool force_draw);
-
-  private:
-    void Init ();
-
-    FilterFactory factory_;
-    dash::Filters::Ptr filters_;
-    std::map <dash::Filter::Ptr, nux::View *> filter_map_;
-  };
-}
-
-#endif // FILTERBAR_H
+namespace unity
+{
+namespace dash
+{
+
+class FilterBar : public nux::View
+{
+  NUX_DECLARE_OBJECT_TYPE(FilterBar, nux::View);
+public:
+  FilterBar(NUX_FILE_LINE_PROTO);
+  ~FilterBar();
+
+  void SetFilters(Filters::Ptr const& filters);
+
+  void AddFilter(Filter::Ptr const& filter);
+  void RemoveFilter(Filter::Ptr const& filter);
+
+protected:
+  virtual void Draw(nux::GraphicsEngine& GfxContext, bool force_draw);
+  virtual void DrawContent(nux::GraphicsEngine& GfxContext, bool force_draw);
+
+private:
+  void Init();
+
+  FilterFactory factory_;
+  Filters::Ptr filters_;
+  std::map<Filter::Ptr, nux::View*> filter_map_;
+};
+
+} // namespace dash
+} // namespace unity
+
+#endif // UNITYSHELL_FILTERBAR_H
+

=== modified file 'plugins/unityshell/src/FilterBasicButton.cpp'
--- plugins/unityshell/src/FilterBasicButton.cpp	2011-11-08 19:41:00 +0000
+++ plugins/unityshell/src/FilterBasicButton.cpp	2012-01-11 09:37:33 +0000
@@ -18,144 +18,123 @@
  * Authored by: Gordon Allott <[e-mail]>
  *
  */
-#include "config.h"
-
-#include <Nux/Nux.h>
-#include <NuxCore/Logger.h>
 
 #include "DashStyle.h"
 #include "FilterBasicButton.h"
 
-namespace
-{
-nux::logging::Logger logger("unity.dash.FilterBasicButton");
-}
-
-namespace unity {
-
-  FilterBasicButton::FilterBasicButton (nux::TextureArea *image, NUX_FILE_LINE_DECL)
-      : nux::ToggleButton (image, NUX_FILE_LINE_PARAM)
-      , prelight_ (NULL)
-      , active_ (NULL)
-      , normal_ (NULL)
-  {
-    InitTheme();
-  }
-
-  FilterBasicButton::FilterBasicButton (const std::string label, NUX_FILE_LINE_DECL)
-      : nux::ToggleButton (NUX_FILE_LINE_PARAM)
-      , prelight_ (NULL)
-      , active_ (NULL)
-      , normal_ (NULL)
-      , label_ (label)
-  {
-    InitTheme();
-  }
-
-  FilterBasicButton::FilterBasicButton (const std::string label, nux::TextureArea *image, NUX_FILE_LINE_DECL)
-      : nux::ToggleButton (image, NUX_FILE_LINE_PARAM)
-      , prelight_ (NULL)
-      , active_ (NULL)
-      , normal_ (NULL)
-      , label_ (label)
-  {
-    InitTheme();
-  }
-
-  FilterBasicButton::FilterBasicButton (NUX_FILE_LINE_DECL)
-      : nux::ToggleButton (NUX_FILE_LINE_PARAM)
-      , prelight_ (NULL)
-      , active_ (NULL)
-      , normal_ (NULL)
-  {
-    InitTheme();
-  }
-
-  FilterBasicButton::~FilterBasicButton() {
-   delete prelight_;
-    delete active_;
-    delete normal_;
-
-  }
-
-  void FilterBasicButton::InitTheme()
-  {
-    if (prelight_ == NULL)
-    {
-      prelight_ = new nux::CairoWrapper(GetGeometry(), sigc::bind(sigc::mem_fun(this, &FilterBasicButton::RedrawTheme), nux::ButtonVisualState::VISUAL_STATE_PRELIGHT));
-      active_ = new nux::CairoWrapper(GetGeometry(), sigc::bind(sigc::mem_fun(this, &FilterBasicButton::RedrawTheme), nux::ButtonVisualState::VISUAL_STATE_PRESSED));
-      normal_ = new nux::CairoWrapper(GetGeometry(), sigc::bind(sigc::mem_fun(this, &FilterBasicButton::RedrawTheme), nux::ButtonVisualState::VISUAL_STATE_NORMAL));
-    }
-
-   // SetMinimumHeight(32);
-  }
-
-  void FilterBasicButton::RedrawTheme (nux::Geometry const& geom, cairo_t *cr, nux::ButtonVisualState faked_state)
-  {
-    dash::Style::Instance().Button(cr, faked_state, label_);
-  }
-
-  long FilterBasicButton::ComputeContentSize ()
-  {
-    long ret = nux::Button::ComputeContentSize();
-    if (cached_geometry_ != GetGeometry())
-    {
-      nux::Geometry geo = GetGeometry();
-      prelight_->Invalidate(geo);
-      active_->Invalidate(geo);
-      normal_->Invalidate(geo);
-    }
-
-    cached_geometry_ = GetGeometry();
-    return ret;
-  }
-
-  void FilterBasicButton::Draw(nux::GraphicsEngine& GfxContext, bool force_draw) {
-    gPainter.PaintBackground(GfxContext, GetGeometry());
-    // set up our texture mode
-    nux::TexCoordXForm texxform;
-    texxform.SetWrap(nux::TEXWRAP_REPEAT, nux::TEXWRAP_REPEAT);
-    texxform.SetTexCoordType(nux::TexCoordXForm::OFFSET_COORD);
-
-    // clear what is behind us
-    unsigned int alpha = 0, src = 0, dest = 0;
-    GfxContext.GetRenderStates().GetBlend(alpha, src, dest);
-    GfxContext.GetRenderStates().SetBlend(true, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
-
-    nux::Color col = nux::color::Black;
-    col.alpha = 0;
-    GfxContext.QRP_Color(GetGeometry().x,
-                         GetGeometry().y,
-                         GetGeometry().width,
-                         GetGeometry().height,
-                         col);
-
-    nux::BaseTexture *texture = normal_->GetTexture();
-    if (Active())
-      texture = active_->GetTexture();
-    else if (GetVisualState() == nux::ButtonVisualState::VISUAL_STATE_PRELIGHT)
-      texture = prelight_->GetTexture();
-    else if (GetVisualState() == nux::ButtonVisualState::VISUAL_STATE_PRESSED)
-    {
-      texture = active_->GetTexture();
-    }
-
-    GfxContext.QRP_1Tex(GetGeometry().x,
-                        GetGeometry().y,
-                        GetGeometry().width,
-                        GetGeometry().height,
-                        texture->GetDeviceTexture(),
-                        texxform,
-                        nux::Color(1.0f, 1.0f, 1.0f, 1.0f));
-
-    GfxContext.GetRenderStates().SetBlend(alpha, src, dest);
-  }
-
-  void FilterBasicButton::DrawContent(nux::GraphicsEngine& GfxContext, bool force_draw) {
-  }
-
-  void FilterBasicButton::PostDraw(nux::GraphicsEngine& GfxContext, bool force_draw) {
-    nux::Button::PostDraw(GfxContext, force_draw);
-  }
-
-}
+namespace unity
+{
+namespace dash
+{
+
+FilterBasicButton::FilterBasicButton(nux::TextureArea* image, NUX_FILE_LINE_DECL)
+  : nux::ToggleButton(image, NUX_FILE_LINE_PARAM)
+{
+  InitTheme();
+}
+
+FilterBasicButton::FilterBasicButton(std::string const& label, NUX_FILE_LINE_DECL)
+  : nux::ToggleButton(NUX_FILE_LINE_PARAM)
+  , label_(label)
+{
+  InitTheme();
+}
+
+FilterBasicButton::FilterBasicButton(std::string const& label, nux::TextureArea* image, NUX_FILE_LINE_DECL)
+  : nux::ToggleButton(image, NUX_FILE_LINE_PARAM)
+  , label_(label)
+{
+  InitTheme();
+}
+
+FilterBasicButton::FilterBasicButton(NUX_FILE_LINE_DECL)
+  : nux::ToggleButton(NUX_FILE_LINE_PARAM)
+{
+  InitTheme();
+}
+
+FilterBasicButton::~FilterBasicButton()
+{
+}
+
+void FilterBasicButton::InitTheme()
+{
+  if (!active_)
+  {
+    nux::Geometry const& geo = GetGeometry();
+
+    prelight_.reset(new nux::CairoWrapper(geo, sigc::bind(sigc::mem_fun(this, &FilterBasicButton::RedrawTheme), nux::ButtonVisualState::VISUAL_STATE_PRELIGHT)));
+    active_.reset(new nux::CairoWrapper(geo, sigc::bind(sigc::mem_fun(this, &FilterBasicButton::RedrawTheme), nux::ButtonVisualState::VISUAL_STATE_PRESSED)));
+    normal_.reset(new nux::CairoWrapper(geo, sigc::bind(sigc::mem_fun(this, &FilterBasicButton::RedrawTheme), nux::ButtonVisualState::VISUAL_STATE_NORMAL)));
+  }
+
+  // SetMinimumHeight(32);
+}
+
+void FilterBasicButton::RedrawTheme(nux::Geometry const& geom, cairo_t* cr, nux::ButtonVisualState faked_state)
+{
+  Style::Instance().Button(cr, faked_state, label_);
+}
+
+long FilterBasicButton::ComputeContentSize()
+{
+  long ret = nux::Button::ComputeContentSize();
+  nux::Geometry const& geo = GetGeometry();
+
+  if (cached_geometry_ != geo)
+  {
+    prelight_->Invalidate(geo);
+    active_->Invalidate(geo);
+    normal_->Invalidate(geo);
+
+    cached_geometry_ = geo;
+  }
+
+  return ret;
+}
+
+void FilterBasicButton::Draw(nux::GraphicsEngine& GfxContext, bool force_draw)
+{
+  nux::Geometry const& geo = GetGeometry();
+
+  gPainter.PaintBackground(GfxContext, geo);
+  // set up our texture mode
+  nux::TexCoordXForm texxform;
+  texxform.SetWrap(nux::TEXWRAP_REPEAT, nux::TEXWRAP_REPEAT);
+  texxform.SetTexCoordType(nux::TexCoordXForm::OFFSET_COORD);
+
+  // clear what is behind us
+  unsigned int alpha = 0, src = 0, dest = 0;
+  GfxContext.GetRenderStates().GetBlend(alpha, src, dest);
+  GfxContext.GetRenderStates().SetBlend(true, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
+
+  nux::Color col = nux::color::Black;
+  col.alpha = 0;
+  GfxContext.QRP_Color(geo.x,
+                       geo.y,
+                       geo.width,
+                       geo.height,
+                       col);
+
+  nux::BaseTexture* texture = normal_->GetTexture();
+  if (Active())
+    texture = active_->GetTexture();
+  else if (GetVisualState() == nux::ButtonVisualState::VISUAL_STATE_PRELIGHT)
+    texture = prelight_->GetTexture();
+  else if (GetVisualState() == nux::ButtonVisualState::VISUAL_STATE_PRESSED)
+    texture = active_->GetTexture();
+
+  GfxContext.QRP_1Tex(geo.x,
+                      geo.y,
+                      geo.width,
+                      geo.height,
+                      texture->GetDeviceTexture(),
+                      texxform,
+                      nux::Color(1.0f, 1.0f, 1.0f, 1.0f));
+
+  GfxContext.GetRenderStates().SetBlend(alpha, src, dest);
+}
+
+} // namespace dash
+} // namespace unity
+

=== modified file 'plugins/unityshell/src/FilterBasicButton.h'
--- plugins/unityshell/src/FilterBasicButton.h	2011-10-25 16:21:21 +0000
+++ plugins/unityshell/src/FilterBasicButton.h	2012-01-11 09:37:33 +0000
@@ -19,10 +19,8 @@
  *
  */
 
-
-
-#ifndef FILTERBASICBUTTON_H
-#define FILTERBASICBUTTON_H
+#ifndef UNITYSHELL_FILTERBASICBUTTON_H
+#define UNITYSHELL_FILTERBASICBUTTON_H
 
 #include <Nux/Nux.h>
 #include <Nux/CairoWrapper.h>
@@ -30,33 +28,39 @@
 
 #include "FilterWidget.h"
 
-namespace unity {
-
-  class FilterBasicButton : public nux::ToggleButton {
-  public:
-    FilterBasicButton (nux::TextureArea *image, NUX_FILE_LINE_PROTO);
-    FilterBasicButton (const std::string label, NUX_FILE_LINE_PROTO);
-    FilterBasicButton (const std::string label, nux::TextureArea *image, NUX_FILE_LINE_PROTO);
-    FilterBasicButton (NUX_FILE_LINE_PROTO);
-    virtual ~FilterBasicButton();
-
-  protected:
-    virtual long ComputeContentSize();
-    virtual void Draw(nux::GraphicsEngine& GfxContext, bool force_draw);
-    virtual void DrawContent(nux::GraphicsEngine& GfxContext, bool force_draw);
-    virtual void PostDraw(nux::GraphicsEngine& GfxContext, bool force_draw);
-
-    void InitTheme ();
-    void RedrawTheme (nux::Geometry const& geom, cairo_t *cr, nux::ButtonVisualState faked_state);
-
-    nux::CairoWrapper *prelight_;
-    nux::CairoWrapper *active_;
-    nux::CairoWrapper *normal_;
-    nux::Geometry cached_geometry_;
-
-  private:
-    std::string label_;
-  };
-
-}
-#endif // FILTERBASICBUTTON_H
+namespace unity
+{
+namespace dash
+{
+
+class FilterBasicButton : public nux::ToggleButton
+{
+public:
+  FilterBasicButton(nux::TextureArea* image, NUX_FILE_LINE_PROTO);
+  FilterBasicButton(std::string const& label, NUX_FILE_LINE_PROTO);
+  FilterBasicButton(std::string const& label, nux::TextureArea* image, NUX_FILE_LINE_PROTO);
+  FilterBasicButton(NUX_FILE_LINE_PROTO);
+  virtual ~FilterBasicButton();
+
+protected:
+  virtual long ComputeContentSize();
+  virtual void Draw(nux::GraphicsEngine& GfxContext, bool force_draw);
+
+  void InitTheme();
+  void RedrawTheme(nux::Geometry const& geom, cairo_t* cr, nux::ButtonVisualState faked_state);
+
+  typedef std::unique_ptr<nux::CairoWrapper> NuxCairoPtr;
+
+  NuxCairoPtr prelight_;
+  NuxCairoPtr active_;
+  NuxCairoPtr normal_;
+  nux::Geometry cached_geometry_;
+
+private:
+  std::string label_;
+};
+
+} // namespace dash
+} // namespace unity
+
+#endif // UNITYSHELL_FILTERBASICBUTTON_H

=== modified file 'plugins/unityshell/src/FilterExpanderLabel.cpp'
--- plugins/unityshell/src/FilterExpanderLabel.cpp	2011-10-25 19:37:13 +0000
+++ plugins/unityshell/src/FilterExpanderLabel.cpp	2012-01-11 09:37:33 +0000
@@ -20,115 +20,133 @@
  *
  */
 
-#include "config.h"
-
-#include <Nux/Nux.h>
-
+#include "DashStyle.h"
 #include "FilterBasicButton.h"
 #include "FilterExpanderLabel.h"
-#include "DashStyle.h"
 
-namespace unity {
+namespace unity
+{
+namespace dash
+{
 
 NUX_IMPLEMENT_OBJECT_TYPE(FilterExpanderLabel);
 
-  FilterExpanderLabel::FilterExpanderLabel (std::string label, NUX_FILE_LINE_DECL)
-      : nux::View (NUX_FILE_LINE_PARAM)
-      , expanded (true)
-      , top_bar_layout_ (NULL)
-      , contents_ (NULL)
-      , right_hand_contents_ (NULL)
-      , expander_graphic_ (NULL)
-      , label_("<span size='larger' weight='bold'>" + label + "</span>")
-  {
-    expanded.changed.connect (sigc::mem_fun(this, &FilterExpanderLabel::DoExpandChange));
-    BuildLayout ();
-  }
-
-  FilterExpanderLabel::~FilterExpanderLabel() {
-
-  }
-
-  void FilterExpanderLabel::SetLabel (std::string label)
-  {
-    label_ = "<span size='larger' weight='bold'>" + label + "</span>";
-    cairo_label_->SetText(label_.c_str());
-  }
-
-  void FilterExpanderLabel::SetRightHandView (nux::View *view)
-  {
-    view->SetMaximumHeight(30);
-
-    right_hand_contents_ = view;
-    top_bar_layout_->AddView(right_hand_contents_, 0, nux::MINOR_POSITION_LEFT, nux::MINOR_SIZE_FULL);
-  }
-
-  void FilterExpanderLabel::SetContents (nux::Layout *contents)
-  {
-    contents_ = contents;
-    contents_->SetVisible(expanded);
-    layout_->AddLayout (contents_, 1, nux::MINOR_POSITION_LEFT, nux::MINOR_SIZE_FULL);
-
-    QueueDraw();
-  }
-
-  void FilterExpanderLabel::BuildLayout ()
-  {
-    layout_ = new nux::VLayout(NUX_TRACKER_LOCATION);
-    top_bar_layout_ = new nux::HLayout(NUX_TRACKER_LOCATION);
-
-    cairo_label_ = new nux::StaticText(label_.c_str(), NUX_TRACKER_LOCATION);
-    cairo_label_->SetFontName("Ubuntu 10");
-    cairo_label_->SetTextColor(nux::Color(1.0f, 1.0f, 1.0f, 1.0f));
-    cairo_label_->mouse_down.connect(
-      [&](int x, int y, unsigned long button_flags, unsigned long key_flag)
-      {
-        expanded = !expanded;
-        if (contents_)
-          contents_->SetVisible(expanded);
-        QueueDraw();
-      });
-
-    top_bar_layout_->AddView (cairo_label_, 1, nux::MINOR_POSITION_LEFT, nux::MINOR_SIZE_FULL);
-    top_bar_layout_->AddSpace(1, 1);
-
-    top_bar_layout_->SetMaximumWidth((dash::Style::Instance().GetTileWidth() -12)*2+10);
-
-    layout_->AddLayout (top_bar_layout_, 0, nux::MINOR_POSITION_LEFT);
-    layout_->SetVerticalInternalMargin(0);
-
-    SetLayout(layout_);
-
-    QueueRelayout();
-    NeedRedraw();
-  }
-
-  void FilterExpanderLabel::DoExpandChange (bool change)
-  {
-    if (contents_)
-      contents_->SetVisible(change);
-
-    QueueRelayout();
-  }
-
-  void FilterExpanderLabel::Draw(nux::GraphicsEngine& GfxContext, bool force_draw) {
-    nux::Geometry geo = GetGeometry();
-
-    GfxContext.PushClippingRectangle(geo);
-    nux::GetPainter().PaintBackground(GfxContext, geo);
-    GfxContext.PopClippingRectangle();
-  }
-
-  void FilterExpanderLabel::DrawContent(nux::GraphicsEngine& GfxContext, bool force_draw) {
-    GfxContext.PushClippingRectangle(GetGeometry());
-
-    GetLayout()->ProcessDraw(GfxContext, force_draw);
-
-    GfxContext.PopClippingRectangle();
-  }
-
-  void FilterExpanderLabel::PostDraw(nux::GraphicsEngine& GfxContext, bool force_draw) {
-    nux::View::PostDraw(GfxContext, force_draw);
-  }
-
-};
+FilterExpanderLabel::FilterExpanderLabel(std::string const& label, NUX_FILE_LINE_DECL)
+  : FilterWidget(NUX_FILE_LINE_PARAM)
+  , expanded(true)
+  , layout_(nullptr)
+  , top_bar_layout_(nullptr)
+  , right_hand_contents_(nullptr)
+  , expander_graphic_(nullptr)
+  , cairo_label_(nullptr)
+  , raw_label_(label)
+  , label_("<span size='larger' weight='bold'>" + label + "</span>" + "  ▾")
+{
+  expanded.changed.connect(sigc::mem_fun(this, &FilterExpanderLabel::DoExpandChange));
+  BuildLayout();
+}
+
+FilterExpanderLabel::~FilterExpanderLabel()
+{
+}
+
+void FilterExpanderLabel::SetLabel(std::string const& label)
+{
+  raw_label_ = label;
+
+  label_ = "<span size='larger' weight='bold'>";
+  label_ += raw_label_;
+  label_ += "</span>";
+  label_ += expanded ? "  ▾" : "  ▸";
+  cairo_label_->SetText(label_.c_str());
+}
+
+void FilterExpanderLabel::SetRightHandView(nux::View* view)
+{
+  view->SetMaximumHeight(30);
+
+  right_hand_contents_ = view;
+  top_bar_layout_->AddView(right_hand_contents_, 0, nux::MINOR_POSITION_LEFT, nux::MINOR_SIZE_FULL);
+}
+
+void FilterExpanderLabel::SetContents(nux::Layout* contents)
+{
+  contents_.Adopt(contents);
+
+  layout_->AddLayout(contents_.GetPointer(), 1, nux::MINOR_POSITION_LEFT, nux::MINOR_SIZE_FULL);
+  top_bar_layout_->SetTopAndBottomPadding(0);
+
+  QueueDraw();
+}
+
+void FilterExpanderLabel::BuildLayout()
+{
+  layout_ = new nux::VLayout(NUX_TRACKER_LOCATION);
+  top_bar_layout_ = new nux::HLayout(NUX_TRACKER_LOCATION);
+
+  cairo_label_ = new nux::StaticText(label_.c_str(), NUX_TRACKER_LOCATION);
+  cairo_label_->SetFontName("Ubuntu 10");
+  cairo_label_->SetTextColor(nux::Color(1.0f, 1.0f, 1.0f, 1.0f));
+  cairo_label_->mouse_down.connect(
+    [&](int x, int y, unsigned long button_flags, unsigned long key_flag)
+    {
+      expanded = !expanded;
+    });
+
+  top_bar_layout_->AddView(cairo_label_, 1, nux::MINOR_POSITION_LEFT, nux::MINOR_SIZE_FULL);
+  top_bar_layout_->AddSpace(1, 1);
+
+  top_bar_layout_->SetMaximumWidth((Style::Instance().GetTileWidth() - 12) * 2 + 10);
+
+  layout_->AddLayout(top_bar_layout_, 0, nux::MINOR_POSITION_LEFT);
+  layout_->SetVerticalInternalMargin(0);
+
+  SetLayout(layout_);
+
+  QueueRelayout();
+  NeedRedraw();
+}
+
+void FilterExpanderLabel::DoExpandChange(bool change)
+{
+  label_ = "<span size='larger' weight='bold'>";
+  label_ += raw_label_;
+  label_ += "</span>";
+  label_ += expanded ? "  ▾" : "  ▸";
+
+  if (cairo_label_)
+    cairo_label_->SetText(label_);
+
+  if (change and contents_ and !contents_->IsChildOf(layout_))
+  {
+    layout_->AddLayout(contents_.GetPointer(), 1, nux::MINOR_POSITION_LEFT, nux::MINOR_SIZE_FULL);
+    top_bar_layout_->SetTopAndBottomPadding(0);
+  }
+  else if (!change and contents_ and contents_->IsChildOf(layout_))
+  {
+    layout_->RemoveChildObject(contents_.GetPointer());
+    top_bar_layout_->SetTopAndBottomPadding(0, 10);
+  }
+
+  layout_->ComputeContentSize();
+  QueueDraw();
+}
+
+void FilterExpanderLabel::Draw(nux::GraphicsEngine& GfxContext, bool force_draw)
+{
+  nux::Geometry const& geo = GetGeometry();
+
+  GfxContext.PushClippingRectangle(geo);
+  nux::GetPainter().PaintBackground(GfxContext, geo);
+  GfxContext.PopClippingRectangle();
+}
+
+void FilterExpanderLabel::DrawContent(nux::GraphicsEngine& GfxContext, bool force_draw)
+{
+  GfxContext.PushClippingRectangle(GetGeometry());
+  GetLayout()->ProcessDraw(GfxContext, force_draw);
+  GfxContext.PopClippingRectangle();
+}
+
+} // namespace dash
+} // namespace unity

=== modified file 'plugins/unityshell/src/FilterExpanderLabel.h'
--- plugins/unityshell/src/FilterExpanderLabel.h	2011-10-11 18:18:13 +0000
+++ plugins/unityshell/src/FilterExpanderLabel.h	2012-01-11 09:37:33 +0000
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef UNITY_FILTEREXPANDERLABEL_H
-#define UNITY_FILTEREXPANDERLABEL_H
+#ifndef UNITYSHELL_FILTEREXPANDERLABEL_H
+#define UNITYSHELL_FILTEREXPANDERLABEL_H
 
 #include <Nux/Nux.h>
 #include <Nux/GridHLayout.h>
@@ -29,39 +29,46 @@
 #include <Nux/VLayout.h>
 #include <Nux/StaticText.h>
 
-namespace unity {
-
-  class FilterExpanderLabel : public nux::View
-  {
-    NUX_DECLARE_OBJECT_TYPE(FilterExpanderLabel, nux::View);
-  public:
-    FilterExpanderLabel (std::string label, NUX_FILE_LINE_PROTO);
-    virtual ~FilterExpanderLabel();
-
-    void SetRightHandView (nux::View *view);
-    void SetLabel (std::string label);
-    void SetContents (nux::Layout *layout);
-
-    nux::Property<bool> expanded;
-
-  protected:
-    virtual void Draw(nux::GraphicsEngine& GfxContext, bool force_draw);
-    virtual void DrawContent(nux::GraphicsEngine& GfxContext, bool force_draw);
-    virtual void PostDraw(nux::GraphicsEngine& GfxContext, bool force_draw);
-
-  private:
-    void BuildLayout ();
-    void DoExpandChange (bool change);
-
-    nux::LinearLayout* layout_;
-    nux::LinearLayout* top_bar_layout_;
-    nux::Layout* contents_;
-    nux::View* right_hand_contents_;
-    nux::View* expander_graphic_;
-    nux::StaticText* cairo_label_;
-    std::string label_;
-  };
-
-}
-
-#endif
+#include "FilterWidget.h"
+
+namespace unity
+{
+namespace dash
+{
+
+class FilterExpanderLabel : public FilterWidget
+{
+  NUX_DECLARE_OBJECT_TYPE(FilterExpanderLabel, FilterWidget);
+public:
+  FilterExpanderLabel(std::string const& label, NUX_FILE_LINE_PROTO);
+  virtual ~FilterExpanderLabel();
+
+  void SetRightHandView(nux::View* view);
+  void SetLabel(std::string const& label);
+  void SetContents(nux::Layout* layout);
+
+  nux::Property<bool> expanded;
+
+protected:
+  virtual void Draw(nux::GraphicsEngine& GfxContext, bool force_draw);
+  virtual void DrawContent(nux::GraphicsEngine& GfxContext, bool force_draw);
+
+private:
+  void BuildLayout();
+  void DoExpandChange(bool change);
+
+  nux::LinearLayout* layout_;
+  nux::LinearLayout* top_bar_layout_;
+  nux::View* right_hand_contents_;
+  nux::View* expander_graphic_;
+  nux::StaticText* cairo_label_;
+  std::string raw_label_;
+  std::string label_;
+
+  nux::ObjectPtr<nux::Layout> contents_;
+};
+
+} // namespace dash
+} // namespace unity
+
+#endif // UNITYSHELL_FILTEREXPANDERLABEL_H

=== modified file 'plugins/unityshell/src/FilterFactory.cpp'
--- plugins/unityshell/src/FilterFactory.cpp	2011-09-06 18:30:26 +0000
+++ plugins/unityshell/src/FilterFactory.cpp	2012-01-11 09:37:33 +0000
@@ -18,11 +18,9 @@
  * Authored by: Gordon Allott <[e-mail]>
  *
  */
-#include "config.h"
 
 #include <Nux/Nux.h>
 #include <NuxCore/Logger.h>
-#include <Nux/View.h>
 
 #include "FilterBasicButton.h"
 #include "FilterFactory.h"
@@ -30,58 +28,56 @@
 #include "FilterMultiRangeWidget.h"
 #include "FilterRatingsWidget.h"
 
-namespace {
+namespace
+{
   nux::logging::Logger logger("unity.dash.filterfactory");
-}
 
-namespace {
   const std::string renderer_type_ratings = "filter-ratings";
   const std::string renderer_type_multirange = "filter-multirange";
   const std::string renderer_type_check_options = "filter-checkoption";
   const std::string renderer_type_radio_options = "filter-radiooption";
 }
 
-namespace unity {
-
-  FilterFactory::FilterFactory() {
-
-  }
-
-  FilterFactory::~FilterFactory() {
-
-  }
-
-  nux::View *FilterFactory::WidgetForFilter (dash::Filter::Ptr filter)
-  {
-    std::string filter_type = filter->renderer_name;
-    LOG_DEBUG(logger) << "building filter of type, " << filter_type;
-
-    nux::View *view = NULL;
-    if (filter_type == renderer_type_check_options)
-    {
-      view = static_cast<nux::View *> (new FilterGenre(NUX_TRACKER_LOCATION));
-    }
-    else if (filter_type == renderer_type_ratings)
-    {
-      view = static_cast<nux::View *> (new FilterRatingsWidget (NUX_TRACKER_LOCATION));
-    }
-    else if (filter_type == renderer_type_multirange)
-    {
-      view = static_cast<nux::View *> (new FilterMultiRange (NUX_TRACKER_LOCATION));
-    }
-    else if (filter_type == renderer_type_radio_options)
-    {
-      view = static_cast<nux::View *> (new FilterGenre (NUX_TRACKER_LOCATION));
-    }
-    else
-    {
-      LOG_WARNING(logger) << "Do not understand filter of type \""
-                          << filter_type
-                          << "\"";
-    }
-
-    dynamic_cast<FilterWidget *>(view)->SetFilter (filter);
-
-    return view;
-  }
+namespace unity
+{
+namespace dash
+{
+
+nux::View* FilterFactory::WidgetForFilter(Filter::Ptr const& filter)
+{
+  std::string filter_type(filter->renderer_name);
+  LOG_DEBUG(logger) << "building filter of type, " << filter_type;
+
+  FilterWidget* widget = nullptr;
+  if (filter_type == renderer_type_check_options)
+  {
+    widget = new FilterGenre(NUX_TRACKER_LOCATION);
+  }
+  else if (filter_type == renderer_type_ratings)
+  {
+    widget = new FilterRatingsWidget(NUX_TRACKER_LOCATION);
+  }
+  else if (filter_type == renderer_type_multirange)
+  {
+    widget = new FilterMultiRange(NUX_TRACKER_LOCATION);
+  }
+  else if (filter_type == renderer_type_radio_options)
+  {
+    widget = new FilterGenre(NUX_TRACKER_LOCATION);
+  }
+  else
+  {
+    LOG_WARNING(logger) << "Do not understand filter of type \""
+                        << filter_type
+                        << "\"";
+  }
+
+  if (widget)
+    widget->SetFilter(filter);
+
+  return widget;
 }
+
+} // namespace dash
+} // namespace unity
+

=== modified file 'plugins/unityshell/src/FilterFactory.h'
--- plugins/unityshell/src/FilterFactory.h	2011-08-04 21:41:10 +0000
+++ plugins/unityshell/src/FilterFactory.h	2012-01-11 09:37:33 +0000
@@ -19,19 +19,25 @@
  *
  */
 
-
-
-#ifndef FILTERFACTORY_H
-#define FILTERFACTORY_H
-namespace unity {
-
-  class FilterFactory
-  {
-  public:
-    FilterFactory();
-    virtual ~FilterFactory();
-
-    nux::View *WidgetForFilter (dash::Filter::Ptr filter);
-  };
+#ifndef UNITYSHELL_FILTERFACTORY_H
+#define UNITYSHELL_FILTERFACTORY_H
+
+#include <Nux/View.h>
+#include <UnityCore/Filter.h>
+
+namespace unity
+{
+namespace dash
+{
+
+class FilterFactory
+{
+public:
+  nux::View* WidgetForFilter(Filter::Ptr const& filter);
 };
-#endif // FILTERFACTORY_H
+
+} // namespace dash
+} // namespace unity
+
+#endif // UNITYSHELL_FILTERFACTORY_H
+

=== modified file 'plugins/unityshell/src/FilterGenreButton.cpp'
--- plugins/unityshell/src/FilterGenreButton.cpp	2011-10-11 18:18:13 +0000
+++ plugins/unityshell/src/FilterGenreButton.cpp	2012-01-11 09:37:33 +0000
@@ -18,62 +18,55 @@
  * Authored by: Gordon Allott <[e-mail]>
  *
  */
-#include "config.h"
-
-#include <Nux/Nux.h>
 
 #include "FilterGenreButton.h"
 
-namespace unity {
-  FilterGenreButton::FilterGenreButton (const std::string label, NUX_FILE_LINE_DECL)
-      : FilterBasicButton(label, NUX_FILE_LINE_PARAM) {
-    InitTheme();
-    
-    state_change.connect ([&] (Button* button) {
-      bool tmp_active = Active();
-      if (filter_ != NULL)
-        filter_->active = tmp_active;
-    });
-  }
-
-  FilterGenreButton::FilterGenreButton (NUX_FILE_LINE_DECL)
-      : FilterBasicButton(NUX_FILE_LINE_PARAM) {
-    InitTheme();
-
-    state_change.connect ([&] (Button* button) {
-      bool tmp_active = Active();
-      if (filter_ != NULL)
-        filter_->active = tmp_active;
-    });
-  }
-
-
-  void FilterGenreButton::SetFilter (dash::FilterOption::Ptr filter)
-  {
-    filter_ = filter;
-
-    bool tmp_active = filter_->active;
-    SetActive(tmp_active);
-    filter_->active.changed.connect ([&] (bool is_active) {
-        SetActive(is_active);
-    });
-  }
-
-  dash::FilterOption::Ptr FilterGenreButton::GetFilter()
-  {
-    return filter_;
-  }
-
-  void FilterGenreButton::Draw(nux::GraphicsEngine& GfxContext, bool force_draw) {
-    FilterBasicButton::Draw(GfxContext, force_draw);
-  }
-
-  void FilterGenreButton::DrawContent(nux::GraphicsEngine& GfxContext, bool force_draw) {
-    FilterBasicButton::DrawContent(GfxContext, force_draw);
-  }
-
-  void FilterGenreButton::PostDraw(nux::GraphicsEngine& GfxContext, bool force_draw) {
-    FilterBasicButton::PostDraw(GfxContext, force_draw);
-  }
-
-}
+namespace unity
+{
+namespace dash
+{
+
+FilterGenreButton::FilterGenreButton(std::string const& label, NUX_FILE_LINE_DECL)
+  : FilterBasicButton(label, NUX_FILE_LINE_PARAM)
+{
+  InitTheme();
+
+  state_change.connect([&](nux::Button* button)
+  {
+    if (filter_)
+      filter_->active = Active();
+  });
+}
+
+FilterGenreButton::FilterGenreButton(NUX_FILE_LINE_DECL)
+  : FilterBasicButton(NUX_FILE_LINE_PARAM)
+{
+  InitTheme();
+
+  state_change.connect([&](nux::Button* button)
+  {
+    if (filter_)
+      filter_->active = Active();
+  });
+}
+
+
+void FilterGenreButton::SetFilter(FilterOption::Ptr const& filter)
+{
+  filter_ = filter;
+
+  SetActive(filter_->active);
+
+  filter_->active.changed.connect([&](bool is_active)
+  {
+    SetActive(is_active);
+  });
+}
+
+FilterOption::Ptr FilterGenreButton::GetFilter()
+{
+  return filter_;
+}
+
+} // namespace dash
+} // namespace unity

=== modified file 'plugins/unityshell/src/FilterGenreButton.h'
--- plugins/unityshell/src/FilterGenreButton.h	2011-10-11 18:18:13 +0000
+++ plugins/unityshell/src/FilterGenreButton.h	2012-01-11 09:37:33 +0000
@@ -19,10 +19,8 @@
  *
  */
 
-
-
-#ifndef FILTERGENREBUTTON_H
-#define FILTERGENREBUTTON_H
+#ifndef UNITYSHELL_FILTERGENREBUTTON_H
+#define UNITYSHELL_FILTERGENREBUTTON_H
 
 #include <Nux/Nux.h>
 #include <Nux/ToggleButton.h>
@@ -30,24 +28,26 @@
 #include "FilterWidget.h"
 #include "FilterBasicButton.h"
 
-namespace unity {
-
-  class FilterGenreButton : public FilterBasicButton {
-  public:
-    FilterGenreButton (const std::string label, NUX_FILE_LINE_PROTO);
-    FilterGenreButton (NUX_FILE_LINE_PROTO);
-
-    void SetFilter (dash::FilterOption::Ptr filter);
-    dash::FilterOption::Ptr GetFilter();
-
-  protected:
-    virtual void Draw(nux::GraphicsEngine& GfxContext, bool force_draw);
-    virtual void DrawContent(nux::GraphicsEngine& GfxContext, bool force_draw);
-    virtual void PostDraw(nux::GraphicsEngine& GfxContext, bool force_draw);
-
-  private:
-    dash::FilterOption::Ptr filter_;
-  };
-
-}
+namespace unity
+{
+namespace dash
+{
+
+class FilterGenreButton : public FilterBasicButton
+{
+public:
+  FilterGenreButton(std::string const& label, NUX_FILE_LINE_PROTO);
+  FilterGenreButton(NUX_FILE_LINE_PROTO);
+
+  void SetFilter(FilterOption::Ptr const& filter);
+  FilterOption::Ptr GetFilter();
+
+private:
+  FilterOption::Ptr filter_;
+};
+
+} // namespace dash
+} // namespace unity
+
 #endif // FILTERGENREBUTTON_H
+

=== modified file 'plugins/unityshell/src/FilterGenreWidget.cpp'
--- plugins/unityshell/src/FilterGenreWidget.cpp	2011-10-25 16:32:49 +0000
+++ plugins/unityshell/src/FilterGenreWidget.cpp	2012-01-11 09:37:33 +0000
@@ -20,152 +20,121 @@
  *
  */
 
-#include "config.h"
-
-#include <Nux/Nux.h>
-#include <NuxCore/Logger.h>
-
 #include <glib.h>
 #include <glib/gi18n-lib.h>
+#include <UnityCore/GLibWrapper.h>
 
+#include "DashStyle.h"
 #include "FilterGenreWidget.h"
 #include "FilterGenreButton.h"
 #include "FilterBasicButton.h"
-#include "DashStyle.h"
 
 namespace unity
 {
-namespace
+namespace dash
 {
-nux::logging::Logger logger("unity.dash.filter");
-}
 
 NUX_IMPLEMENT_OBJECT_TYPE(FilterGenre);
 
-  FilterGenre::FilterGenre (NUX_FILE_LINE_DECL)
-      : FilterExpanderLabel (_("Categories"), NUX_FILE_LINE_PARAM)
-      , all_selected (false)
-  {
-    InitTheme();
-
-    all_button_ = new FilterBasicButton(_("All"), NUX_TRACKER_LOCATION);
-    all_button_->state_change.connect(sigc::mem_fun(this, &FilterGenre::OnAllActivated));
-    all_button_->SetLabel(_("All"));
-
-    genre_layout_ = new nux::GridHLayout(NUX_TRACKER_LOCATION);
-    genre_layout_->ForceChildrenSize(true);
-    genre_layout_->MatchContentSize(true);
-    genre_layout_->SetSpaceBetweenChildren (10, 12);
-    genre_layout_->SetTopAndBottomPadding (12);
-    genre_layout_->EnablePartialVisibility (false);
-    genre_layout_->SetChildrenSize (dash::Style::Instance().GetTileWidth() - 12, 32);
-
-    SetRightHandView(all_button_);
-    SetContents(genre_layout_);
-  }
-
-  FilterGenre::~FilterGenre()
-  {
-  }
-
-  void FilterGenre::SetFilter(dash::Filter::Ptr filter)
-  {
-    filter_ = std::static_pointer_cast<dash::CheckOptionFilter>(filter);
-
-    filter_->option_added.connect (sigc::mem_fun (this, &FilterGenre::OnOptionAdded));
-    filter_->option_removed.connect(sigc::mem_fun (this, &FilterGenre::OnOptionRemoved));
-
-    // finally - make sure we are up-todate with our filter list
-    dash::CheckOptionFilter::CheckOptions::iterator it;
-    dash::CheckOptionFilter::CheckOptions options = filter_->options;
-    for (it = options.begin(); it < options.end(); it++)
-      OnOptionAdded(*it);
-
-    SetLabel(filter_->name);
-  }
-
-  void FilterGenre::OnOptionAdded(dash::FilterOption::Ptr new_filter)
-  {
-    std::string tmp_label = new_filter->name;
-
-    char* escape = g_markup_escape_text(tmp_label.c_str(), -1);
-    std::string label = escape;
-    g_free(escape);
-
-    FilterGenreButton* button = new FilterGenreButton (label, NUX_TRACKER_LOCATION);
-    button->SetFilter (new_filter);
-    genre_layout_->AddView (button, 0, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_FULL);
-    buttons_.push_back (button);
-  }
-
-  void FilterGenre::OnOptionRemoved(dash::FilterOption::Ptr removed_filter)
-  {
-    std::vector<FilterGenreButton*>::iterator it;
-    FilterGenreButton* found_filter = NULL;
-    for ( it=buttons_.begin() ; it < buttons_.end(); it++ )
-    {
-      if ((*it)->GetFilter() == removed_filter)
-      {
-        found_filter = *it;
-        break;
-      }
-    }
-
-    if (found_filter)
+FilterGenre::FilterGenre(NUX_FILE_LINE_DECL)
+ : FilterExpanderLabel(_("Categories"), NUX_FILE_LINE_PARAM)
+{
+  InitTheme();
+
+  all_button_ = new FilterAllButton(NUX_TRACKER_LOCATION);
+
+  genre_layout_ = new nux::GridHLayout(NUX_TRACKER_LOCATION);
+  genre_layout_->ForceChildrenSize(true);
+  genre_layout_->MatchContentSize(true);
+  genre_layout_->SetSpaceBetweenChildren(10, 12);
+  genre_layout_->SetTopAndBottomPadding(12);
+  genre_layout_->EnablePartialVisibility(false);
+  genre_layout_->SetChildrenSize(Style::Instance().GetTileWidth() - 12, 32);
+
+  SetRightHandView(all_button_);
+  SetContents(genre_layout_);
+}
+
+FilterGenre::~FilterGenre()
+{
+}
+
+void FilterGenre::SetFilter(Filter::Ptr const& filter)
+{
+  filter_ = std::static_pointer_cast<CheckOptionFilter>(filter);
+
+  all_button_->SetFilter(filter_);
+  expanded = !filter_->collapsed();
+  
+  filter_->option_added.connect(sigc::mem_fun(this, &FilterGenre::OnOptionAdded));
+  filter_->option_removed.connect(sigc::mem_fun(this, &FilterGenre::OnOptionRemoved));
+
+  // finally - make sure we are up-todate with our filter list
+  for (auto it : filter_->options())
+    OnOptionAdded(it);
+
+  SetLabel(filter_->name);
+}
+
+void FilterGenre::OnOptionAdded(FilterOption::Ptr const& new_filter)
+{
+  std::string tmp_label(new_filter->name);
+
+  glib::String escape(g_markup_escape_text(tmp_label.c_str(), -1));
+  std::string label(escape.Value());
+
+  FilterGenreButton* button = new FilterGenreButton(label, NUX_TRACKER_LOCATION);
+  button->SetFilter(new_filter);
+  genre_layout_->AddView(button, 0, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_FULL);
+  buttons_.push_back(button);
+}
+
+void FilterGenre::OnOptionRemoved(FilterOption::Ptr const& removed_filter)
+{
+  for (auto it=buttons_.begin() ; it != buttons_.end(); ++it)
+  {
+    if ((*it)->GetFilter() == removed_filter)
     {
       genre_layout_->RemoveChildObject(*it);
       buttons_.erase(it);
+      break;
     }
   }
-
-  std::string FilterGenre::GetFilterType ()
-  {
-    return "FilterBasicButton";
-  }
-
-  void FilterGenre::InitTheme()
-  {
-    //FIXME - build theme here - store images, cache them, fun fun fun
-  }
-
-  void FilterGenre::OnAllActivated(nux::View *view)
-  {
-    if (filter_)
-      filter_->Clear();
-  }
-
-  void FilterGenre::OnGenreActivated(nux::View *view)
-  {
-    // just check to see if all the filters are active or not
-    // if they are, then set the all status to true
-  }
-
-  void FilterGenre::Draw(nux::GraphicsEngine& GfxContext, bool force_draw) {
-    nux::Geometry geo = GetGeometry();
-    nux::Color col(0.2f, 0.2f, 0.2f, 0.2f);
-
-    GfxContext.PushClippingRectangle(geo);
-    nux::GetPainter().PaintBackground(GfxContext, geo);
-
-    nux::GetPainter().Draw2DLine(GfxContext,
-                                 geo.x, geo.y + geo.height - 1,
-                                 geo.x + geo.width, geo.y + geo.height - 1,
-                                 col,
-                                 col);
-
-    GfxContext.PopClippingRectangle();
-  }
-
-  void FilterGenre::DrawContent(nux::GraphicsEngine& GfxContext, bool force_draw) {
-    GfxContext.PushClippingRectangle(GetGeometry());
-
-    GetLayout()->ProcessDraw(GfxContext, force_draw);
-
-    GfxContext.PopClippingRectangle();
-  }
-
-  void FilterGenre::PostDraw(nux::GraphicsEngine& GfxContext, bool force_draw) {
-    nux::View::PostDraw(GfxContext, force_draw);
-  }
-
-};
+}
+
+std::string FilterGenre::GetFilterType()
+{
+  return "FilterBasicButton";
+}
+
+void FilterGenre::InitTheme()
+{
+  //FIXME - build theme here - store images, cache them, fun fun fun
+}
+
+void FilterGenre::Draw(nux::GraphicsEngine& GfxContext, bool force_draw)
+{
+  nux::Geometry const& geo = GetGeometry();
+  nux::Color col(0.2f, 0.2f, 0.2f, 0.2f);
+
+  GfxContext.PushClippingRectangle(geo);
+  nux::GetPainter().PaintBackground(GfxContext, geo);
+
+  nux::GetPainter().Draw2DLine(GfxContext,
+                               geo.x, geo.y + geo.height - 1,
+                               geo.x + geo.width, geo.y + geo.height - 1,
+                               col,
+                               col);
+
+  GfxContext.PopClippingRectangle();
+}
+
+void FilterGenre::DrawContent(nux::GraphicsEngine& GfxContext, bool force_draw)
+{
+  GfxContext.PushClippingRectangle(GetGeometry());
+  GetLayout()->ProcessDraw(GfxContext, force_draw);
+  GfxContext.PopClippingRectangle();
+}
+
+} // namespace dash
+} // namespace unity

=== modified file 'plugins/unityshell/src/FilterGenreWidget.h'
--- plugins/unityshell/src/FilterGenreWidget.h	2011-10-11 18:18:13 +0000
+++ plugins/unityshell/src/FilterGenreWidget.h	2012-01-11 09:37:33 +0000
@@ -20,10 +20,8 @@
  *
  */
 
-
-
-#ifndef FILTERGENREWIDGET_H
-#define FILTERGENREWIDGET_H
+#ifndef UNITYSHELL_FILTERGENREWIDGET_H
+#define UNITYSHELL_FILTERGENREWIDGET_H
 
 #include <Nux/Nux.h>
 #include <Nux/GridHLayout.h>
@@ -32,45 +30,45 @@
 
 #include <UnityCore/CheckOptionFilter.h>
 
-#include "FilterWidget.h"
+#include "FilterAllButton.h"
 #include "FilterExpanderLabel.h"
 
-namespace unity {
-  class FilterBasicButton;
-  class FilterGenreButton;
-
-  class FilterGenre : public FilterExpanderLabel, public FilterWidget
-  {
-    NUX_DECLARE_OBJECT_TYPE(FilterGenre, FilterExpanderLabel);
-  public:
-    FilterGenre (NUX_FILE_LINE_PROTO);
-    virtual ~FilterGenre();
-
-    void SetFilter (dash::Filter::Ptr filter);
-    std::string GetFilterType ();
-
-    nux::Property<bool> all_selected;
-
-  protected:
-    virtual void Draw(nux::GraphicsEngine& GfxContext, bool force_draw);
-    virtual void DrawContent(nux::GraphicsEngine& GfxContext, bool force_draw);
-    virtual void PostDraw(nux::GraphicsEngine& GfxContext, bool force_draw);
-
-    void InitTheme ();
-
-  private:
-    void OnAllActivated(nux::View* view);
-    void OnGenreActivated(nux::View* view);
-    void OnOptionAdded(dash::FilterOption::Ptr new_filter);
-    void OnOptionRemoved(dash::FilterOption::Ptr removed_filter);
-
-    nux::GridHLayout* genre_layout_;
-    FilterBasicButton* all_button_;
-
-    std::vector<FilterGenreButton*> buttons_;
-    dash::CheckOptionFilter::Ptr filter_;
-  };
-
-}
-
-#endif // FILTERGENRESWIDGET_H
+namespace unity
+{
+namespace dash
+{
+
+class FilterBasicButton;
+class FilterGenreButton;
+
+class FilterGenre : public FilterExpanderLabel
+{
+  NUX_DECLARE_OBJECT_TYPE(FilterGenre, FilterExpanderLabel);
+public:
+  FilterGenre(NUX_FILE_LINE_PROTO);
+  virtual ~FilterGenre();
+
+  void SetFilter(Filter::Ptr const& filter);
+  std::string GetFilterType();
+
+protected:
+  virtual void Draw(nux::GraphicsEngine& GfxContext, bool force_draw);
+  virtual void DrawContent(nux::GraphicsEngine& GfxContext, bool force_draw);
+
+  void InitTheme();
+
+private:
+  void OnOptionAdded(FilterOption::Ptr const& new_filter);
+  void OnOptionRemoved(FilterOption::Ptr const& removed_filter);
+
+  nux::GridHLayout* genre_layout_;
+  FilterAllButton* all_button_;
+
+  std::vector<FilterGenreButton*> buttons_;
+  CheckOptionFilter::Ptr filter_;
+};
+
+} // namespace dash
+} // namespace unity
+
+#endif // UNITYSHELL_FILTERGENRESWIDGET_H

=== modified file 'plugins/unityshell/src/FilterMultiRangeButton.cpp'
--- plugins/unityshell/src/FilterMultiRangeButton.cpp	2011-11-08 19:41:00 +0000
+++ plugins/unityshell/src/FilterMultiRangeButton.cpp	2012-01-11 09:37:33 +0000
@@ -25,187 +25,181 @@
 #include "DashStyle.h"
 #include "FilterMultiRangeButton.h"
 
-namespace unity {
-  FilterMultiRangeButton::FilterMultiRangeButton (const std::string label, NUX_FILE_LINE_DECL)
-      : nux::ToggleButton(label, NUX_FILE_LINE_PARAM)
-      , prelight_ (NULL)
-      , active_ (NULL)
-      , normal_ (NULL)
-      , has_arrow_ (MULTI_RANGE_ARROW_NONE)
-      , side_ (MULTI_RANGE_CENTER)
-  {
-    InitTheme();
-    state_change.connect (sigc::mem_fun(this, &FilterMultiRangeButton::OnActivated));
-  }
-
-  FilterMultiRangeButton::FilterMultiRangeButton (NUX_FILE_LINE_DECL)
-      : nux::ToggleButton(NUX_FILE_LINE_PARAM)
-      , prelight_ (NULL)
-      , active_ (NULL)
-      , normal_ (NULL)
-      , has_arrow_ (MULTI_RANGE_ARROW_NONE)
-      , side_ (MULTI_RANGE_CENTER)
-  {
-    InitTheme();
-    state_change.connect (sigc::mem_fun(this, &FilterMultiRangeButton::OnActivated));
-  }
-
-  FilterMultiRangeButton::~FilterMultiRangeButton()
-  {
-    delete prelight_;
-    delete normal_;
-    delete active_;
-  }
-
-  void FilterMultiRangeButton::OnActivated (nux::Area *area)
-  {
-    bool tmp_active = Active();
-    if (filter_ != NULL)
-      filter_->active = tmp_active;
-  }
-
-  void FilterMultiRangeButton::OnActiveChanged(bool value)
-  {
-    NeedRedraw();
-  }
-
-  void FilterMultiRangeButton::SetFilter (dash::FilterOption::Ptr filter)
-  {
-    filter_ = filter;
-    bool tmp_active = filter_->active;
-    SetActive(tmp_active);
-  }
-
-  dash::FilterOption::Ptr FilterMultiRangeButton::GetFilter()
-  {
-    return filter_;
-  }
-
-  void FilterMultiRangeButton::SetVisualSide (MultiRangeSide side)
-  {
-    side_ = side;
-    prelight_->Invalidate(GetGeometry());
-    active_->Invalidate(GetGeometry());
-    normal_->Invalidate(GetGeometry());
-  }
-
-  void FilterMultiRangeButton::SetHasArrow (MultiRangeArrow value)
-  {
-    has_arrow_ = value;
-    active_->Invalidate(GetGeometry());
-    NeedRedraw();
-  }
-
-  long FilterMultiRangeButton::ComputeContentSize()
-  {
-    if (prelight_ == NULL)
-    {
-      InitTheme();
-    }
-    long ret = nux::ToggleButton::ComputeContentSize();
-    if (cached_geometry_ != GetGeometry())
-    {
-      prelight_->Invalidate(GetGeometry());
-      active_->Invalidate(GetGeometry());
-      normal_->Invalidate(GetGeometry());
-    }
-
-    cached_geometry_ = GetGeometry();
-    return ret;
-  }
-
-  void FilterMultiRangeButton::InitTheme()
-  {
-    if (prelight_ == NULL)
-    {
-      prelight_ = new nux::CairoWrapper(GetGeometry(), sigc::bind(sigc::mem_fun(this, &FilterMultiRangeButton::RedrawTheme), nux::ButtonVisualState::VISUAL_STATE_PRELIGHT));
-      active_ = new nux::CairoWrapper(GetGeometry(), sigc::bind(sigc::mem_fun(this, &FilterMultiRangeButton::RedrawTheme), nux::ButtonVisualState::VISUAL_STATE_PRESSED));
-      normal_ = new nux::CairoWrapper(GetGeometry(), sigc::bind(sigc::mem_fun(this, &FilterMultiRangeButton::RedrawTheme), nux::ButtonVisualState::VISUAL_STATE_NORMAL));
-    }
-
-    SetMinimumHeight(32);
-  }
-
-  void FilterMultiRangeButton::RedrawTheme (nux::Geometry const& geom, cairo_t *cr, nux::ButtonVisualState faked_state)
-  {
-    std::string name = "10";
-    std::stringstream final;
-
-    if (filter_)
-    {
-      name = filter_->name;
-      final << "<small>" << name << "</small>";
-    }
-
-    dash::Arrow arrow;
-    if (has_arrow_ == MULTI_RANGE_ARROW_NONE)
-      arrow = dash::Arrow::NONE;
-    else if (has_arrow_ == MULTI_RANGE_ARROW_LEFT)
-      arrow = dash::Arrow::LEFT;
-    else if (has_arrow_ == MULTI_RANGE_ARROW_BOTH)
-      arrow = dash::Arrow::BOTH;
-    else
-      arrow = dash::Arrow::RIGHT;
-
-    dash::Segment segment;
-    if (side_ == MULTI_RANGE_SIDE_LEFT)
-      segment = dash::Segment::LEFT;
-    else if (side_ == MULTI_RANGE_CENTER)
-      segment = dash::Segment::MIDDLE;
-    else
-      segment = dash::Segment::RIGHT;
-
-    dash::Style::Instance().MultiRangeSegment(cr, faked_state, final.str(), arrow, segment);
-    NeedRedraw();
-  }
-
-  void FilterMultiRangeButton::Draw(nux::GraphicsEngine& GfxContext, bool force_draw) {
-    gPainter.PaintBackground(GfxContext, GetGeometry());
-    // set up our texture mode
-    nux::TexCoordXForm texxform;
-    texxform.SetWrap(nux::TEXWRAP_REPEAT, nux::TEXWRAP_REPEAT);
-    texxform.SetTexCoordType(nux::TexCoordXForm::OFFSET_COORD);
-
-    // clear what is behind us
-    unsigned int alpha = 0, src = 0, dest = 0;
-    GfxContext.GetRenderStates().GetBlend(alpha, src, dest);
-    GfxContext.GetRenderStates().SetBlend(true, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
-
-    nux::Color col = nux::color::Black;
-    col.alpha = 0;
-    GfxContext.QRP_Color(GetGeometry().x,
-                         GetGeometry().y,
-                         GetGeometry().width,
-                         GetGeometry().height,
-                         col);
-
-    nux::BaseTexture *texture = normal_->GetTexture();
-    //FIXME - dashstyle does not give us a focused state yet, so ignore
-    //~ if (state == nux::ButtonVisualState::NUX_VISUAL_STATE_PRELIGHT)
-    //~ {
-      //~ texture = prelight_->GetTexture();
-    //~ }
-    if (Active())
-    {
-      texture = active_->GetTexture();
-    }
-
-    GfxContext.QRP_1Tex(GetGeometry().x,
-                        GetGeometry().y,
-                        GetGeometry().width,
-                        GetGeometry().height,
-                        texture->GetDeviceTexture(),
-                        texxform,
-                        nux::Color(1.0f, 1.0f, 1.0f, 1.0f));
-    GfxContext.GetRenderStates().SetBlend(alpha, src, dest);
-  }
-
-  void FilterMultiRangeButton::DrawContent(nux::GraphicsEngine& GfxContext, bool force_draw) {
-    //nux::ToggleButton::DrawContent(GfxContext, force_draw);
-  }
-
-  void FilterMultiRangeButton::PostDraw(nux::GraphicsEngine& GfxContext, bool force_draw) {
-    nux::ToggleButton::PostDraw(GfxContext, force_draw);
-  }
-
-}
+namespace unity
+{
+namespace dash
+{
+
+FilterMultiRangeButton::FilterMultiRangeButton(std::string const& label, NUX_FILE_LINE_DECL)
+  : nux::ToggleButton(label, NUX_FILE_LINE_PARAM)
+  , has_arrow_(MultiRangeArrow::NONE)
+  , side_(MultiRangeSide::CENTER)
+{
+  InitTheme();
+  state_change.connect(sigc::mem_fun(this, &FilterMultiRangeButton::OnActivated));
+}
+
+FilterMultiRangeButton::FilterMultiRangeButton(NUX_FILE_LINE_DECL)
+  : nux::ToggleButton(NUX_FILE_LINE_PARAM)
+  , has_arrow_(MultiRangeArrow::NONE)
+  , side_(MultiRangeSide::CENTER)
+{
+  InitTheme();
+  state_change.connect(sigc::mem_fun(this, &FilterMultiRangeButton::OnActivated));
+}
+
+FilterMultiRangeButton::~FilterMultiRangeButton()
+{
+}
+
+void FilterMultiRangeButton::OnActivated(nux::Area* area)
+{
+  if (filter_)
+    filter_->active = Active();
+}
+
+void FilterMultiRangeButton::OnActiveChanged(bool value)
+{
+  NeedRedraw();
+}
+
+void FilterMultiRangeButton::SetFilter(FilterOption::Ptr const& filter)
+{
+  filter_ = filter;
+  SetActive(filter_->active);
+}
+
+FilterOption::Ptr FilterMultiRangeButton::GetFilter()
+{
+  return filter_;
+}
+
+void FilterMultiRangeButton::SetVisualSide(MultiRangeSide side)
+{
+  nux::Geometry const& geo = GetGeometry();
+
+  side_ = side;
+  prelight_->Invalidate(geo);
+  active_->Invalidate(geo);
+  normal_->Invalidate(geo);
+}
+
+void FilterMultiRangeButton::SetHasArrow(MultiRangeArrow value)
+{
+  has_arrow_ = value;
+  active_->Invalidate(GetGeometry());
+  NeedRedraw();
+}
+
+long FilterMultiRangeButton::ComputeContentSize()
+{
+  if (!active_)
+  {
+    InitTheme();
+  }
+  long ret = nux::ToggleButton::ComputeContentSize();
+  nux::Geometry const& geo = GetGeometry();
+  if (cached_geometry_ != geo)
+  {
+    prelight_->Invalidate(geo);
+    active_->Invalidate(geo);
+    normal_->Invalidate(geo);
+    cached_geometry_ = geo;
+  }
+
+  return ret;
+}
+
+void FilterMultiRangeButton::InitTheme()
+{
+  if (!active_)
+  {
+    nux::Geometry const& geo = GetGeometry();
+    active_.reset(new nux::CairoWrapper(geo, sigc::bind(sigc::mem_fun(this, &FilterMultiRangeButton::RedrawTheme), nux::ButtonVisualState::VISUAL_STATE_PRESSED)));
+    normal_.reset(new nux::CairoWrapper(geo, sigc::bind(sigc::mem_fun(this, &FilterMultiRangeButton::RedrawTheme), nux::ButtonVisualState::VISUAL_STATE_NORMAL)));
+    prelight_.reset(new nux::CairoWrapper(geo, sigc::bind(sigc::mem_fun(this, &FilterMultiRangeButton::RedrawTheme), nux::ButtonVisualState::VISUAL_STATE_PRELIGHT)));
+  }
+
+  SetMinimumHeight(32);
+}
+
+void FilterMultiRangeButton::RedrawTheme(nux::Geometry const& geom, cairo_t* cr, nux::ButtonVisualState faked_state)
+{
+  std::string name("10");
+  std::stringstream final;
+
+  if (filter_)
+  {
+    name = filter_->name;
+    final << "<small>" << name << "</small>";
+  }
+
+  Arrow arrow;
+  if (has_arrow_ == MultiRangeArrow::NONE)
+    arrow = Arrow::NONE;
+  else if (has_arrow_ == MultiRangeArrow::LEFT)
+    arrow = Arrow::LEFT;
+  else if (has_arrow_ == MultiRangeArrow::BOTH)
+    arrow = Arrow::BOTH;
+  else
+    arrow = Arrow::RIGHT;
+
+  Segment segment;
+  if (side_ == MultiRangeSide::LEFT)
+    segment = Segment::LEFT;
+  else if (side_ == MultiRangeSide::CENTER)
+    segment = Segment::MIDDLE;
+  else
+    segment = Segment::RIGHT;
+
+  Style::Instance().MultiRangeSegment(cr, faked_state, final.str(), arrow, segment);
+  NeedRedraw();
+}
+
+void FilterMultiRangeButton::Draw(nux::GraphicsEngine& GfxContext, bool force_draw)
+{
+  nux::Geometry const& geo = GetGeometry();
+
+  gPainter.PaintBackground(GfxContext, geo);
+  // set up our texture mode
+  nux::TexCoordXForm texxform;
+  texxform.SetWrap(nux::TEXWRAP_REPEAT, nux::TEXWRAP_REPEAT);
+  texxform.SetTexCoordType(nux::TexCoordXForm::OFFSET_COORD);
+
+  // clear what is behind us
+  unsigned int alpha = 0, src = 0, dest = 0;
+  GfxContext.GetRenderStates().GetBlend(alpha, src, dest);
+  GfxContext.GetRenderStates().SetBlend(true, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
+
+  nux::Color col = nux::color::Black;
+  col.alpha = 0;
+  GfxContext.QRP_Color(geo.x,
+                       geo.y,
+                       geo.width,
+                       geo.height,
+                       col);
+
+  nux::BaseTexture* texture = normal_->GetTexture();
+  //FIXME - dashstyle does not give us a focused state yet, so ignore
+  if (GetVisualState() == nux::ButtonVisualState::VISUAL_STATE_PRELIGHT)
+  {
+    texture = prelight_->GetTexture();
+  }
+
+  if (Active())
+  {
+    texture = active_->GetTexture();
+  }
+
+  GfxContext.QRP_1Tex(geo.x,
+                      geo.y,
+                      geo.width,
+                      geo.height,
+                      texture->GetDeviceTexture(),
+                      texxform,
+                      nux::Color(1.0f, 1.0f, 1.0f, 1.0f));
+  GfxContext.GetRenderStates().SetBlend(alpha, src, dest);
+}
+
+} // namespace dash
+} // namespace unity

=== modified file 'plugins/unityshell/src/FilterMultiRangeButton.h'
--- plugins/unityshell/src/FilterMultiRangeButton.h	2011-10-25 16:21:21 +0000
+++ plugins/unityshell/src/FilterMultiRangeButton.h	2012-01-11 09:37:33 +0000
@@ -19,10 +19,10 @@
  *
  */
 
-
-
-#ifndef FILTERMULTIRANGEBUTTON_H
-#define FILTERMULTIRANGEBUTTON_H
+#ifndef UNITYSHELL_FILTERMULTIRANGEBUTTON_H
+#define UNITYSHELL_FILTERMULTIRANGEBUTTON_H
+
+#include <memory>
 
 #include <Nux/Nux.h>
 #include <Nux/CairoWrapper.h>
@@ -31,57 +31,62 @@
 
 #include "FilterWidget.h"
 
-namespace unity {
-
-    typedef enum {
-      MULTI_RANGE_SIDE_LEFT,
-      MULTI_RANGE_SIDE_RIGHT,
-      MULTI_RANGE_CENTER
-    } MultiRangeSide;
-
-    typedef enum {
-      MULTI_RANGE_ARROW_LEFT,
-      MULTI_RANGE_ARROW_RIGHT,
-      MULTI_RANGE_ARROW_BOTH,
-      MULTI_RANGE_ARROW_NONE
-    } MultiRangeArrow;
-
-  class FilterMultiRangeButton : public nux::ToggleButton {
-  public:
-
-    FilterMultiRangeButton (const std::string label, NUX_FILE_LINE_PROTO);
-    FilterMultiRangeButton (NUX_FILE_LINE_PROTO);
-    virtual ~FilterMultiRangeButton();
-
-    void SetFilter (dash::FilterOption::Ptr filter);
-    dash::FilterOption::Ptr GetFilter();
-
-    void SetVisualSide(MultiRangeSide side); //0 = left, 1 = center, 2 = right - sucky api i know :(
-    void SetHasArrow (MultiRangeArrow arrow); //0 = left, 1 = both, 2 = right, -1 = none
-
-  protected:
-    virtual long ComputeContentSize();
-    virtual void Draw(nux::GraphicsEngine& GfxContext, bool force_draw);
-    virtual void DrawContent(nux::GraphicsEngine& GfxContext, bool force_draw);
-    virtual void PostDraw(nux::GraphicsEngine& GfxContext, bool force_draw);
-
-  private:
-    dash::FilterOption::Ptr filter_;
-
-    void InitTheme ();
-    void RedrawTheme (nux::Geometry const& geom, cairo_t *cr, nux::ButtonVisualState faked_state);
-    void OnActivated (nux::Area *area);
-    void OnActiveChanged(bool value);
-
-    nux::CairoWrapper *prelight_;
-    nux::CairoWrapper *active_;
-    nux::CairoWrapper *normal_;
-    nux::Geometry cached_geometry_;
-    MultiRangeArrow has_arrow_;
-    MultiRangeSide side_;
-
-
-  };
-
-}
-#endif // FILTERMULTIRANGEBUTTON_H
+namespace unity
+{
+namespace dash
+{
+
+enum class MultiRangeSide
+{
+  LEFT,
+  RIGHT,
+  CENTER
+};
+
+enum class MultiRangeArrow
+{
+  LEFT,
+  RIGHT,
+  BOTH,
+  NONE
+};
+
+class FilterMultiRangeButton : public nux::ToggleButton
+{
+public:
+  FilterMultiRangeButton (std::string const& label, NUX_FILE_LINE_PROTO);
+  FilterMultiRangeButton (NUX_FILE_LINE_PROTO);
+  ~FilterMultiRangeButton();
+
+  void SetFilter(FilterOption::Ptr const& filter);
+  FilterOption::Ptr GetFilter();
+
+  void SetVisualSide(MultiRangeSide side); //0 = left, 1 = center, 2 = right - sucky api i know :(
+  void SetHasArrow(MultiRangeArrow arrow); //0 = left, 1 = both, 2 = right, -1 = none
+
+protected:
+  virtual long ComputeContentSize();
+  virtual void Draw(nux::GraphicsEngine& GfxContext, bool force_draw);
+
+private:
+  void InitTheme();
+  void RedrawTheme(nux::Geometry const& geom, cairo_t* cr, nux::ButtonVisualState faked_state);
+  void OnActivated(nux::Area* area);
+  void OnActiveChanged(bool value);
+
+  FilterOption::Ptr filter_;
+
+  typedef std::unique_ptr<nux::CairoWrapper> NuxCairoPtr;
+
+  NuxCairoPtr active_;
+  NuxCairoPtr normal_;
+  NuxCairoPtr prelight_;
+  nux::Geometry cached_geometry_;
+  MultiRangeArrow has_arrow_;
+  MultiRangeSide side_;
+};
+
+} // namespace dash
+} // namespace unity
+
+#endif // UNITYSHELL_FILTERMULTIRANGEBUTTON_H

=== modified file 'plugins/unityshell/src/FilterMultiRangeWidget.cpp'
--- plugins/unityshell/src/FilterMultiRangeWidget.cpp	2011-10-11 18:18:13 +0000
+++ plugins/unityshell/src/FilterMultiRangeWidget.cpp	2012-01-11 09:37:33 +0000
@@ -20,8 +20,6 @@
  *
  */
 
-#include "config.h"
-
 #include <Nux/Nux.h>
 
 #include "FilterMultiRangeWidget.h"
@@ -31,174 +29,155 @@
 #include <glib.h>
 #include <glib/gi18n-lib.h>
 
-namespace unity {
+namespace unity
+{
+namespace dash
+{
 
 NUX_IMPLEMENT_OBJECT_TYPE(FilterMultiRange);
 
-  FilterMultiRange::FilterMultiRange (NUX_FILE_LINE_DECL)
-      : FilterExpanderLabel (_("Multi-range"), NUX_FILE_LINE_PARAM)
-      , all_selected (false) {
-    InitTheme();
-
-    all_button_ = new FilterBasicButton(_("All"), NUX_TRACKER_LOCATION);
-    all_button_->state_change.connect(sigc::mem_fun(this, &FilterMultiRange::OnAllActivated));
-    all_button_->SetLabel(_("All"));
-
-    layout_ = new nux::HLayout(NUX_TRACKER_LOCATION);
-    layout_->SetVerticalExternalMargin (12);
-
-    SetRightHandView(all_button_);
-    SetContents(layout_);
-    OnActiveChanged(false);
-  }
-
-  FilterMultiRange::~FilterMultiRange()
-  {
-  }
-
-  void FilterMultiRange::SetFilter(dash::Filter::Ptr filter)
-  {
-    filter_ = std::static_pointer_cast<dash::MultiRangeFilter>(filter);
-
-    filter_->option_added.connect (sigc::mem_fun (this, &FilterMultiRange::OnOptionAdded));
-    filter_->option_removed.connect(sigc::mem_fun (this, &FilterMultiRange::OnOptionRemoved));
-
-    // finally - make sure we are up-todate with our filter list
-    dash::MultiRangeFilter::Options::iterator it;
-    dash::MultiRangeFilter::Options options = filter_->options;
-    for (it = options.begin(); it < options.end(); it++)
-      OnOptionAdded(*it);
-
-    SetLabel(filter_->name);
-  }
-
-  void FilterMultiRange::OnActiveChanged(bool value)
-  {
-    // go through all the buttons, and set the state :(
-
-    std::vector<FilterMultiRangeButton*>::iterator it;
-    int start = 2000;
-    int end = 0;
-    int index = 0;
-    for ( it=buttons_.begin() ; it < buttons_.end(); it++ )
-    {
-      FilterMultiRangeButton* button = (*it);
-      dash::FilterOption::Ptr filter = button->GetFilter();
-      bool tmp_active = filter->active;
-      button->SetActive(tmp_active);
-      if (filter != NULL)
-      {
-        if (filter->active)
-        {
-          if (index < start)
-            start = index;
-          if (index > end)
-            end = index;
-        }
-      }
-      index++;
-    }
-
-    index = 0;
-    for ( it=buttons_.begin() ; it < buttons_.end(); it++ )
-    {
-      FilterMultiRangeButton* button = (*it);
-
-      if (index == start && index == end)
-        button->SetHasArrow(MultiRangeArrow::MULTI_RANGE_ARROW_BOTH);
-      else if (index == start)
-        button->SetHasArrow(MultiRangeArrow::MULTI_RANGE_ARROW_LEFT);
-      else if (index == end)
-        button->SetHasArrow(MultiRangeArrow::MULTI_RANGE_ARROW_RIGHT);
-      else
-        button->SetHasArrow(MultiRangeArrow::MULTI_RANGE_ARROW_NONE);
-
-      if (index == 0)
-        button->SetVisualSide(MULTI_RANGE_SIDE_LEFT);
-      else if (index == (int)buttons_.size() - 1)
-        button->SetVisualSide(MULTI_RANGE_SIDE_RIGHT);
-      else
-        button->SetVisualSide(MULTI_RANGE_CENTER);
-
-      index++;
-    }
-  }
-
-  void FilterMultiRange::OnOptionAdded(dash::FilterOption::Ptr new_filter)
-  {
-    FilterMultiRangeButton* button = new FilterMultiRangeButton (NUX_TRACKER_LOCATION);
-    button->SetFilter (new_filter);
-    layout_->AddView (button, 1);
-    buttons_.push_back (button);
-    new_filter->active.changed.connect(sigc::mem_fun (this, &FilterMultiRange::OnActiveChanged));
-    OnActiveChanged(false);
-
-  }
-
-  void FilterMultiRange::OnOptionRemoved(dash::FilterOption::Ptr removed_filter)
-  {
-    std::vector<FilterMultiRangeButton*>::iterator it;
-    FilterMultiRangeButton* found_filter = NULL;
-    for ( it=buttons_.begin() ; it < buttons_.end(); it++ )
-    {
-      if ((*it)->GetFilter() == removed_filter)
-      {
-        found_filter = *it;
-        break;
-      }
-    }
-
-    if (found_filter)
+FilterMultiRange::FilterMultiRange(NUX_FILE_LINE_DECL)
+  : FilterExpanderLabel(_("Multi-range"), NUX_FILE_LINE_PARAM)
+{
+  InitTheme();
+
+  all_button_ = new FilterAllButton(NUX_TRACKER_LOCATION);
+
+  layout_ = new nux::HLayout(NUX_TRACKER_LOCATION);
+  layout_->SetVerticalExternalMargin(12);
+
+  SetRightHandView(all_button_);
+  SetContents(layout_);
+  OnActiveChanged(false);
+}
+
+FilterMultiRange::~FilterMultiRange()
+{
+}
+
+void FilterMultiRange::SetFilter(Filter::Ptr const& filter)
+{
+  filter_ = std::static_pointer_cast<MultiRangeFilter>(filter);
+
+  all_button_->SetFilter(filter_);
+  expanded = !filter_->collapsed();
+
+  filter_->option_added.connect(sigc::mem_fun(this, &FilterMultiRange::OnOptionAdded));
+  filter_->option_removed.connect(sigc::mem_fun(this, &FilterMultiRange::OnOptionRemoved));
+
+  // finally - make sure we are up-todate with our filter list
+  for (auto it : filter_->options())
+    OnOptionAdded(it);
+
+  SetLabel(filter_->name);
+}
+
+void FilterMultiRange::OnActiveChanged(bool value)
+{
+  // go through all the buttons, and set the state :(
+  int start = 2000;
+  int end = 0;
+  int index = 0;
+  for (auto button : buttons_)
+  {
+    FilterOption::Ptr filter = button->GetFilter();
+    bool tmp_active = filter->active;
+    button->SetActive(tmp_active);
+    if (filter != nullptr)
+    {
+      if (filter->active)
+      {
+        if (index < start)
+          start = index;
+        if (index > end)
+          end = index;
+      }
+    }
+    index++;
+  }
+
+  index = 0;
+  for (auto button : buttons_)
+  {
+    if (index == start && index == end)
+      button->SetHasArrow(MultiRangeArrow::BOTH);
+    else if (index == start)
+      button->SetHasArrow(MultiRangeArrow::LEFT);
+    else if (index == end)
+      button->SetHasArrow(MultiRangeArrow::RIGHT);
+    else
+      button->SetHasArrow(MultiRangeArrow::NONE);
+
+    if (index == 0)
+      button->SetVisualSide(MultiRangeSide::LEFT);
+    else if (index == (int)buttons_.size() - 1)
+      button->SetVisualSide(MultiRangeSide::RIGHT);
+    else
+      button->SetVisualSide(MultiRangeSide::CENTER);
+
+    index++;
+  }
+}
+
+void FilterMultiRange::OnOptionAdded(FilterOption::Ptr const& new_filter)
+{
+  FilterMultiRangeButton* button = new FilterMultiRangeButton(NUX_TRACKER_LOCATION);
+  button->SetFilter(new_filter);
+  layout_->AddView(button);
+  buttons_.push_back(button);
+  new_filter->active.changed.connect(sigc::mem_fun(this, &FilterMultiRange::OnActiveChanged));
+  OnActiveChanged(false);
+
+}
+
+void FilterMultiRange::OnOptionRemoved(FilterOption::Ptr const& removed_filter)
+{
+  for (auto it=buttons_.begin() ; it != buttons_.end(); it++)
+  {
+    if ((*it)->GetFilter() == removed_filter)
     {
       layout_->RemoveChildObject(*it);
       buttons_.erase(it);
+      break;
     }
-
-    OnActiveChanged(false);
-  }
-
-  std::string FilterMultiRange::GetFilterType ()
-  {
-    return "FilterMultiRange";
-  }
-
-  void FilterMultiRange::InitTheme()
-  {
-    //FIXME - build theme here - store images, cache them, fun fun fun
-  }
-
-  void FilterMultiRange::OnAllActivated(nux::View *view)
-  {
-    if (filter_)
-      filter_->Clear();
-  }
-
-  void FilterMultiRange::Draw(nux::GraphicsEngine& GfxContext, bool force_draw) {
-    nux::Geometry geo = GetGeometry();
-    nux::Color col(0.2f, 0.2f, 0.2f, 0.2f);
-
-    GfxContext.PushClippingRectangle(geo);
-    nux::GetPainter().PaintBackground(GfxContext, geo);
-
-    nux::GetPainter().Draw2DLine(GfxContext,
-                                 geo.x, geo.y + geo.height - 1,
-                                 geo.x + geo.width, geo.y + geo.height - 1,
-                                 col,
-                                 col);
-
-    GfxContext.PopClippingRectangle();
-  }
-
-  void FilterMultiRange::DrawContent(nux::GraphicsEngine& GfxContext, bool force_draw) {
-    GfxContext.PushClippingRectangle(GetGeometry());
-
-    GetLayout()->ProcessDraw(GfxContext, force_draw);
-
-    GfxContext.PopClippingRectangle();
-  }
-
-  void FilterMultiRange::PostDraw(nux::GraphicsEngine& GfxContext, bool force_draw) {
-    nux::View::PostDraw(GfxContext, force_draw);
-  }
-
-};
+  }
+
+  OnActiveChanged(false);
+}
+
+std::string FilterMultiRange::GetFilterType()
+{
+  return "FilterMultiRange";
+}
+
+void FilterMultiRange::InitTheme()
+{
+  //FIXME - build theme here - store images, cache them, fun fun fun
+}
+
+void FilterMultiRange::Draw(nux::GraphicsEngine& GfxContext, bool force_draw)
+{
+  nux::Geometry const& geo = GetGeometry();
+  nux::Color col(0.2f, 0.2f, 0.2f, 0.2f);
+
+  GfxContext.PushClippingRectangle(geo);
+  nux::GetPainter().PaintBackground(GfxContext, geo);
+
+  nux::GetPainter().Draw2DLine(GfxContext,
+                               geo.x, geo.y + geo.height - 1,
+                               geo.x + geo.width, geo.y + geo.height - 1,
+                               col,
+                               col);
+
+  GfxContext.PopClippingRectangle();
+}
+
+void FilterMultiRange::DrawContent(nux::GraphicsEngine& GfxContext, bool force_draw)
+{
+  GfxContext.PushClippingRectangle(GetGeometry());
+  GetLayout()->ProcessDraw(GfxContext, force_draw);
+  GfxContext.PopClippingRectangle();
+}
+
+} // namespace dash
+} // namespace unity

=== modified file 'plugins/unityshell/src/FilterMultiRangeWidget.h'
--- plugins/unityshell/src/FilterMultiRangeWidget.h	2011-10-11 18:18:13 +0000
+++ plugins/unityshell/src/FilterMultiRangeWidget.h	2012-01-11 09:37:33 +0000
@@ -20,55 +20,55 @@
  *
  */
 
-
-
-#ifndef FILTERMULTIRANGE_H
-#define FILTERMULTIRANGE_H
+#ifndef UNITYSHELL_FILTERMULTIRANGE_H
+#define UNITYSHELL_FILTERMULTIRANGE_H
 
 #include <Nux/Nux.h>
 #include <Nux/HLayout.h>
 #include <Nux/VLayout.h>
 #include <UnityCore/MultiRangeFilter.h>
 
-#include "FilterWidget.h"
+#include "FilterAllButton.h"
 #include "FilterBasicButton.h"
 #include "FilterExpanderLabel.h"
 
-namespace unity {
-  class FilterMultiRangeButton;
-
-  class FilterMultiRange : public FilterExpanderLabel, public FilterWidget
-  {
-    NUX_DECLARE_OBJECT_TYPE(FilterMultiRange, FilterExpanderLabel);
-  public:
-    FilterMultiRange (NUX_FILE_LINE_PROTO);
-    virtual ~FilterMultiRange();
-
-    void SetFilter (dash::Filter::Ptr filter);
-    std::string GetFilterType ();
-
-    nux::Property<bool> all_selected;
-
-  protected:
-    virtual void Draw(nux::GraphicsEngine& GfxContext, bool force_draw);
-    virtual void DrawContent(nux::GraphicsEngine& GfxContext, bool force_draw);
-    virtual void PostDraw(nux::GraphicsEngine& GfxContext, bool force_draw);
-
-    void InitTheme ();
-
-  private:
-    void OnAllActivated(nux::View* view);
-    void OnOptionAdded(dash::FilterOption::Ptr new_filter);
-    void OnOptionRemoved(dash::FilterOption::Ptr removed_filter);
-    void OnActiveChanged(bool value);
-
-    nux::HLayout *layout_;
-    FilterBasicButton* all_button_;
-
-    std::vector<FilterMultiRangeButton*> buttons_;
-    dash::MultiRangeFilter::Ptr filter_;
-  };
-
-}
-
-#endif // FILTERMULTIRANGE_H
+namespace unity
+{
+namespace dash
+{
+
+class FilterMultiRangeButton;
+
+class FilterMultiRange : public FilterExpanderLabel
+{
+  NUX_DECLARE_OBJECT_TYPE(FilterMultiRange, FilterExpanderLabel);
+public:
+  FilterMultiRange(NUX_FILE_LINE_PROTO);
+  virtual ~FilterMultiRange();
+
+  void SetFilter(Filter::Ptr const& filter);
+  std::string GetFilterType();
+
+protected:
+  virtual void Draw(nux::GraphicsEngine& GfxContext, bool force_draw);
+  virtual void DrawContent(nux::GraphicsEngine& GfxContext, bool force_draw);
+
+  void InitTheme();
+
+private:
+  void OnAllActivated(nux::View* view);
+  void OnOptionAdded(dash::FilterOption::Ptr const& new_filter);
+  void OnOptionRemoved(dash::FilterOption::Ptr const& removed_filter);
+  void OnActiveChanged(bool value);
+
+  nux::HLayout* layout_;
+  FilterAllButton* all_button_;
+
+  std::vector<FilterMultiRangeButton*> buttons_;
+  MultiRangeFilter::Ptr filter_;
+};
+
+} // unityshell dash
+} // unityshell unity
+
+#endif // UNITYSHELL_FILTERMULTIRANGE_H

=== modified file 'plugins/unityshell/src/FilterRatingsButton.cpp'
--- plugins/unityshell/src/FilterRatingsButton.cpp	2011-11-08 19:41:00 +0000
+++ plugins/unityshell/src/FilterRatingsButton.cpp	2012-01-11 09:37:33 +0000
@@ -19,8 +19,6 @@
  *
  */
 
-#include "config.h"
-
 #include <math.h>
 
 #include <Nux/Nux.h>
@@ -29,237 +27,218 @@
 #include "DashStyle.h"
 #include "FilterRatingsButton.h"
 
-namespace {
-  nux::logging::Logger logger("unity.dash.FilterRatingsButton");
-}
-
-namespace unity {
-
-  FilterRatingsButton::FilterRatingsButton (NUX_FILE_LINE_DECL)
-      : nux::Button (NUX_FILE_LINE_PARAM)
-      , prelight_empty_ (NULL)
-      , active_empty_ (NULL)
-      , normal_empty_ (NULL)
-      , prelight_half_ (NULL)
-      , active_half_ (NULL)
-      , normal_half_ (NULL)
-      , prelight_full_ (NULL)
-      , active_full_ (NULL)
-      , normal_full_ (NULL)
-  {
-    InitTheme();
-
-    mouse_up.connect (sigc::mem_fun (this, &FilterRatingsButton::RecvMouseUp) );
-    mouse_drag.connect (sigc::mem_fun (this, &FilterRatingsButton::RecvMouseDrag) );
-  }
-
-  FilterRatingsButton::~FilterRatingsButton() {
-    delete prelight_empty_;
-    delete active_empty_;
-    delete normal_empty_;
-    delete prelight_half_;
-    delete active_half_;
-    delete normal_half_;
-    delete prelight_full_;
-    delete active_full_ ;
-    delete normal_full_;
-  }
-
-  void FilterRatingsButton::SetFilter(dash::Filter::Ptr filter)
-  {
-    filter_ = std::static_pointer_cast<dash::RatingsFilter>(filter);
-    filter_->rating.changed.connect (sigc::mem_fun (this, &FilterRatingsButton::OnRatingsChanged));
-    NeedRedraw();
-  }
-
-  std::string FilterRatingsButton::GetFilterType ()
-  {
-    return "FilterRatingsButton";
-  }
-
-  void FilterRatingsButton::InitTheme()
-  {
-    if (prelight_empty_ == NULL)
-    {
-      nux::Geometry geometry = GetGeometry();
-      geometry.width /= 5;
-      prelight_empty_ = new nux::CairoWrapper(geometry, sigc::bind(sigc::mem_fun(this, &FilterRatingsButton::RedrawTheme), 0, nux::ButtonVisualState::VISUAL_STATE_PRELIGHT));
-      active_empty_ = new nux::CairoWrapper(geometry, sigc::bind(sigc::mem_fun(this, &FilterRatingsButton::RedrawTheme), 0, nux::ButtonVisualState::VISUAL_STATE_PRESSED));
-      normal_empty_ = new nux::CairoWrapper(geometry, sigc::bind(sigc::mem_fun(this, &FilterRatingsButton::RedrawTheme), 0, nux::ButtonVisualState::VISUAL_STATE_NORMAL));
-
-      prelight_half_ = new nux::CairoWrapper(geometry, sigc::bind(sigc::mem_fun(this, &FilterRatingsButton::RedrawTheme), 1, nux::ButtonVisualState::VISUAL_STATE_PRELIGHT));
-      active_half_ = new nux::CairoWrapper(geometry, sigc::bind(sigc::mem_fun(this, &FilterRatingsButton::RedrawTheme), 1, nux::ButtonVisualState::VISUAL_STATE_PRESSED));
-      normal_half_ = new nux::CairoWrapper(geometry, sigc::bind(sigc::mem_fun(this, &FilterRatingsButton::RedrawTheme), 1, nux::ButtonVisualState::VISUAL_STATE_NORMAL));
-
-      prelight_full_ = new nux::CairoWrapper(geometry, sigc::bind(sigc::mem_fun(this, &FilterRatingsButton::RedrawTheme), 2, nux::ButtonVisualState::VISUAL_STATE_PRELIGHT));
-      active_full_ = new nux::CairoWrapper(geometry, sigc::bind(sigc::mem_fun(this, &FilterRatingsButton::RedrawTheme), 2, nux::ButtonVisualState::VISUAL_STATE_PRESSED));
-      normal_full_ = new nux::CairoWrapper(geometry, sigc::bind(sigc::mem_fun(this, &FilterRatingsButton::RedrawTheme), 2, nux::ButtonVisualState::VISUAL_STATE_NORMAL));
-    }
-  }
-
-  void FilterRatingsButton::RedrawTheme (nux::Geometry const& geom, cairo_t *cr, int type, nux::ButtonVisualState faked_state)
-  {
-    dash::Style& dash_style = dash::Style::Instance();
-    if (type == 0)
-    {
-      // empty
-      dash_style.StarEmpty (cr, faked_state);
-    }
-    else if (type == 1)
-    {
-      // half
-      dash_style.StarHalf (cr, faked_state);
+namespace unity
+{
+namespace dash
+{
+
+FilterRatingsButton::FilterRatingsButton(NUX_FILE_LINE_DECL)
+  : nux::ToggleButton(NUX_FILE_LINE_PARAM)
+{
+  InitTheme();
+
+  mouse_up.connect(sigc::mem_fun(this, &FilterRatingsButton::RecvMouseUp));
+  mouse_drag.connect(sigc::mem_fun(this, &FilterRatingsButton::RecvMouseDrag));
+}
+
+FilterRatingsButton::~FilterRatingsButton()
+{
+}
+
+void FilterRatingsButton::SetFilter(Filter::Ptr const& filter)
+{
+  filter_ = std::static_pointer_cast<RatingsFilter>(filter);
+  filter_->rating.changed.connect(sigc::mem_fun(this, &FilterRatingsButton::OnRatingsChanged));
+  NeedRedraw();
+}
+
+std::string FilterRatingsButton::GetFilterType()
+{
+  return "FilterRatingsButton";
+}
+
+void FilterRatingsButton::InitTheme()
+{
+  if (!active_empty_)
+  {
+    nux::Geometry geometry(GetGeometry());
+    geometry.width /= 5;
+
+    active_empty_.reset(new nux::CairoWrapper(geometry, sigc::bind(sigc::mem_fun(this, &FilterRatingsButton::RedrawTheme), 0, nux::ButtonVisualState::VISUAL_STATE_PRESSED)));
+    normal_empty_.reset(new nux::CairoWrapper(geometry, sigc::bind(sigc::mem_fun(this, &FilterRatingsButton::RedrawTheme), 0, nux::ButtonVisualState::VISUAL_STATE_NORMAL)));
+    prelight_empty_.reset(new nux::CairoWrapper(geometry, sigc::bind(sigc::mem_fun(this, &FilterRatingsButton::RedrawTheme), 0, nux::ButtonVisualState::VISUAL_STATE_PRELIGHT)));
+
+    active_half_.reset(new nux::CairoWrapper(geometry, sigc::bind(sigc::mem_fun(this, &FilterRatingsButton::RedrawTheme), 1, nux::ButtonVisualState::VISUAL_STATE_PRESSED)));
+    normal_half_.reset(new nux::CairoWrapper(geometry, sigc::bind(sigc::mem_fun(this, &FilterRatingsButton::RedrawTheme), 1, nux::ButtonVisualState::VISUAL_STATE_NORMAL)));
+    prelight_half_.reset(new nux::CairoWrapper(geometry, sigc::bind(sigc::mem_fun(this, &FilterRatingsButton::RedrawTheme), 1, nux::ButtonVisualState::VISUAL_STATE_PRELIGHT)));
+
+    active_full_.reset(new nux::CairoWrapper(geometry, sigc::bind(sigc::mem_fun(this, &FilterRatingsButton::RedrawTheme), 2, nux::ButtonVisualState::VISUAL_STATE_PRESSED)));
+    normal_full_.reset(new nux::CairoWrapper(geometry, sigc::bind(sigc::mem_fun(this, &FilterRatingsButton::RedrawTheme), 2, nux::ButtonVisualState::VISUAL_STATE_NORMAL)));
+    prelight_full_.reset(new nux::CairoWrapper(geometry, sigc::bind(sigc::mem_fun(this, &FilterRatingsButton::RedrawTheme), 2, nux::ButtonVisualState::VISUAL_STATE_PRELIGHT)));
+  }
+}
+
+void FilterRatingsButton::RedrawTheme(nux::Geometry const& geom, cairo_t* cr, int type, nux::ButtonVisualState faked_state)
+{
+  Style& dash_style = Style::Instance();
+  if (type == 0)
+  {
+    // empty
+    dash_style.StarEmpty(cr, faked_state);
+  }
+  else if (type == 1)
+  {
+    // half
+    dash_style.StarHalf(cr, faked_state);
+  }
+  else
+  {
+    // full
+    dash_style.StarFull(cr, faked_state);
+  }
+}
+
+long FilterRatingsButton::ComputeContentSize()
+{
+  long ret = nux::Button::ComputeContentSize();
+  nux::Geometry geo(GetGeometry());
+
+  if (cached_geometry_ != geo)
+  {
+    geo.width = 27;
+    active_empty_->Invalidate(geo);
+    normal_empty_->Invalidate(geo);
+    prelight_empty_->Invalidate(geo);
+
+    active_half_->Invalidate(geo);
+    normal_half_->Invalidate(geo);
+    prelight_half_->Invalidate(geo);
+
+    active_full_->Invalidate(geo);
+    normal_full_->Invalidate(geo);
+    prelight_full_->Invalidate(geo);
+
+    cached_geometry_ = geo;
+  }
+
+  return ret;
+}
+
+void FilterRatingsButton::Draw(nux::GraphicsEngine& GfxContext, bool force_draw)
+{
+  int rating = 0;
+  if (filter_ && filter_->filtering)
+    rating = static_cast<int>(filter_->rating * 5);
+  // FIXME: 9/26/2011
+  // We should probably support an API for saying whether the ratings
+  // should or shouldn't support half stars...but our only consumer at
+  // the moment is the applications lens which according to design
+  // (Bug #839759) shouldn't. So for now just force rounding.
+  //    int total_half_stars = rating % 2;
+  //    int total_full_stars = rating / 2;
+  int total_full_stars = rating;
+  int total_half_stars = 0;
+
+  nux::Geometry const& geo = GetGeometry();
+  nux::Geometry geo_star(geo);
+  geo_star.width = 27;
+
+  gPainter.PaintBackground(GfxContext, geo);
+  // set up our texture mode
+  nux::TexCoordXForm texxform;
+  texxform.SetWrap(nux::TEXWRAP_REPEAT, nux::TEXWRAP_REPEAT);
+  texxform.SetTexCoordType(nux::TexCoordXForm::OFFSET_COORD);
+
+  // clear what is behind us
+  unsigned int alpha = 0, src = 0, dest = 0;
+
+  GfxContext.GetRenderStates().GetBlend(alpha, src, dest);
+  GfxContext.GetRenderStates().SetBlend(true, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
+
+  nux::Color col = nux::color::Black;
+  col.alpha = 0;
+  GfxContext.QRP_Color(geo.x,
+                       geo.y,
+                       geo.width,
+                       geo.height,
+                       col);
+
+  for (int index = 0; index < 5; index++)
+  {
+    nux::BaseTexture* texture = normal_empty_->GetTexture();
+    if (index < total_full_stars)
+    {
+      if (GetVisualState() == nux::ButtonVisualState::VISUAL_STATE_NORMAL)
+        texture = normal_full_->GetTexture();
+      else if (GetVisualState() == nux::ButtonVisualState::VISUAL_STATE_PRELIGHT)
+        texture = prelight_full_->GetTexture();
+      else if (GetVisualState() == nux::ButtonVisualState::VISUAL_STATE_PRESSED)
+        texture = active_full_->GetTexture();
+    }
+    else if (index < total_full_stars + total_half_stars)
+    {
+      if (GetVisualState() == nux::ButtonVisualState::VISUAL_STATE_NORMAL)
+        texture = normal_half_->GetTexture();
+      else if (GetVisualState() == nux::ButtonVisualState::VISUAL_STATE_PRELIGHT)
+        texture = prelight_half_->GetTexture();
+      else if (GetVisualState() == nux::ButtonVisualState::VISUAL_STATE_PRESSED)
+        texture = active_half_->GetTexture();
     }
     else
     {
-      // full
-      dash_style.StarFull (cr, faked_state);
-    }
-  }
-
-  long FilterRatingsButton::ComputeContentSize ()
-  {
-    long ret = nux::Button::ComputeContentSize();
-    if (cached_geometry_ != GetGeometry())
-    {
-      nux::Geometry geometry = GetGeometry();
-      //geometry.width /= 5;
-      geometry.width = 27;
-      prelight_empty_->Invalidate(geometry);
-      active_empty_->Invalidate(geometry);
-      normal_empty_->Invalidate(geometry);
-
-      prelight_half_->Invalidate(geometry);
-      active_half_->Invalidate(geometry);
-      normal_half_->Invalidate(geometry);
-
-      prelight_full_->Invalidate(geometry);
-      active_full_->Invalidate(geometry);
-      normal_full_->Invalidate(geometry);
-    }
-
-    cached_geometry_ = GetGeometry();
-    return ret;
-  }
-
-  void FilterRatingsButton::Draw(nux::GraphicsEngine& GfxContext, bool force_draw) {
-    int rating = 0;
-    if (filter_ != NULL && filter_->filtering)
-      rating = static_cast<int>(filter_->rating * 5);
-    // FIXME: 9/26/2011
-    // We should probably support an API for saying whether the ratings
-    // should or shouldn't support half stars...but our only consumer at
-    // the moment is the applications lens which according to design
-    // (Bug #839759) shouldn't. So for now just force rounding.
-    //    int total_half_stars = rating % 2;
-    //    int total_full_stars = rating / 2;
-    int total_full_stars = rating;
-    int total_half_stars = 0;
-    
-    nux::Geometry geometry = GetGeometry ();
-    //geometry.width = geometry.width / 5;
-    geometry.width = 27;
-
-    gPainter.PaintBackground(GfxContext, GetGeometry());
-    // set up our texture mode
-    nux::TexCoordXForm texxform;
-    texxform.SetWrap(nux::TEXWRAP_REPEAT, nux::TEXWRAP_REPEAT);
-    texxform.SetTexCoordType(nux::TexCoordXForm::OFFSET_COORD);
-
-    // clear what is behind us
-    unsigned int alpha = 0, src = 0, dest = 0;
-
-    GfxContext.GetRenderStates().GetBlend(alpha, src, dest);
-    GfxContext.GetRenderStates().SetBlend(true, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
-
-    nux::Color col = nux::color::Black;
-    col.alpha = 0;
-    GfxContext.QRP_Color(GetGeometry().x,
-                         GetGeometry().y,
-                         GetGeometry().width,
-                         GetGeometry().height,
-                         col);
-
-    for (int index = 0; index < 5; index++)
-    {
-      nux::BaseTexture *texture = normal_empty_->GetTexture();
-
-      if (index < total_full_stars) {
-        if (GetVisualState() == nux::ButtonVisualState::VISUAL_STATE_NORMAL)
-          texture = normal_full_->GetTexture();
-        else if (GetVisualState() == nux::ButtonVisualState::VISUAL_STATE_PRELIGHT)
-          texture = prelight_full_->GetTexture();
-        else if (GetVisualState() == nux::ButtonVisualState::VISUAL_STATE_PRESSED)
-          texture = active_full_->GetTexture();
-      }
-      else if (index < total_full_stars + total_half_stars) {
-        if (GetVisualState() == nux::ButtonVisualState::VISUAL_STATE_NORMAL)
-          texture = normal_half_->GetTexture();
-        else if (GetVisualState() == nux::ButtonVisualState::VISUAL_STATE_PRELIGHT)
-          texture = prelight_half_->GetTexture();
-        else if (GetVisualState() == nux::ButtonVisualState::VISUAL_STATE_PRESSED)
-          texture = active_half_->GetTexture();
-      }
-      else {
-        if (GetVisualState() == nux::ButtonVisualState::VISUAL_STATE_NORMAL)
-          texture = normal_empty_->GetTexture();
-        else if (GetVisualState() == nux::ButtonVisualState::VISUAL_STATE_PRELIGHT)
-          texture = prelight_empty_->GetTexture();
-        else if (GetVisualState() == nux::ButtonVisualState::VISUAL_STATE_PRESSED)
-          texture = active_empty_->GetTexture();
-      }
-
-      GfxContext.QRP_1Tex(geometry.x,
-                          geometry.y,
-                          geometry.width,
-                          geometry.height,
-                          texture->GetDeviceTexture(),
-                          texxform,
-                          nux::Color(1.0f, 1.0f, 1.0f, 1.0f));
-
-      geometry.x += geometry.width + 10;
-
-    }
-
-    GfxContext.GetRenderStates().SetBlend(alpha, src, dest);
-
-  }
-
-  void FilterRatingsButton::DrawContent(nux::GraphicsEngine& GfxContext, bool force_draw) {
-    nux::Button::DrawContent(GfxContext, force_draw);
-  }
-
-  void FilterRatingsButton::PostDraw(nux::GraphicsEngine& GfxContext, bool force_draw) {
-    nux::Button::PostDraw(GfxContext, force_draw);
-  }
-  
-  static void _UpdateRatingToMouse (dash::RatingsFilter::Ptr filter, int x)
-  {
-    int width = 180;
-    float new_rating = (static_cast<float>(x) / width);
-
-    // FIXME: change to 10 once we decide to support also half-stars
-    new_rating = ceil(5*new_rating)/5;
-    new_rating = new_rating > 1 ? 1 : (new_rating < 0 ? 0 : new_rating);
-    
-    if (filter != NULL)
-      filter->rating = new_rating;
-  }
-
-  void FilterRatingsButton::RecvMouseUp (int x, int y, unsigned long button_flags, unsigned long key_flags) 
-  {
-    _UpdateRatingToMouse (filter_, x);
-  }
-
-  void FilterRatingsButton::RecvMouseDrag (int x, int y, int dx, int dy, 
-					   unsigned long button_flags, 
-					   unsigned long key_flags)
-  {
-    _UpdateRatingToMouse (filter_, x);
-  }
-
-  void FilterRatingsButton::OnRatingsChanged (int rating) {
-    NeedRedraw();
-  }
-
-};
+      if (GetVisualState() == nux::ButtonVisualState::VISUAL_STATE_NORMAL)
+        texture = normal_empty_->GetTexture();
+      else if (GetVisualState() == nux::ButtonVisualState::VISUAL_STATE_PRELIGHT)
+        texture = prelight_empty_->GetTexture();
+      else if (GetVisualState() == nux::ButtonVisualState::VISUAL_STATE_PRESSED)
+        texture = active_empty_->GetTexture();
+    }
+
+    GfxContext.QRP_1Tex(geo_star.x,
+                        geo_star.y,
+                        geo_star.width,
+                        geo_star.height,
+                        texture->GetDeviceTexture(),
+                        texxform,
+                        nux::Color(1.0f, 1.0f, 1.0f, 1.0f));
+
+    geo_star.x += geo_star.width + 10;
+
+  }
+
+  GfxContext.GetRenderStates().SetBlend(alpha, src, dest);
+
+}
+
+static void _UpdateRatingToMouse(RatingsFilter::Ptr filter, int x)
+{
+  int width = 180;
+  float new_rating = (static_cast<float>(x) / width);
+
+  // FIXME: change to 10 once we decide to support also half-stars
+  new_rating = ceil(5 * new_rating) / 5;
+  new_rating = (new_rating > 1) ? 1 : ((new_rating < 0) ? 0 : new_rating);
+
+  if (filter)
+    filter->rating = new_rating;
+}
+
+void FilterRatingsButton::RecvMouseUp(int x, int y, unsigned long button_flags, unsigned long key_flags)
+{
+  _UpdateRatingToMouse(filter_, x);
+}
+
+void FilterRatingsButton::RecvMouseDrag(int x, int y, int dx, int dy,
+                                        unsigned long button_flags,
+                                        unsigned long key_flags)
+{
+  _UpdateRatingToMouse(filter_, x);
+}
+
+void FilterRatingsButton::OnRatingsChanged(int rating)
+{
+  NeedRedraw();
+}
+
+} // namespace dash
+} // namespace unity

=== modified file 'plugins/unityshell/src/FilterRatingsButton.h'
--- plugins/unityshell/src/FilterRatingsButton.h	2011-10-11 18:18:13 +0000
+++ plugins/unityshell/src/FilterRatingsButton.h	2012-01-11 09:37:33 +0000
@@ -19,59 +19,61 @@
  *
  */
 
-
-
-#ifndef FILTERRATINGSBUTTONWIDGET_H
-#define FILTERRATINGSBUTTONWIDGET_H
+#ifndef UNITYSHELL_FILTERRATINGSBUTTONWIDGET_H
+#define UNITYSHELL_FILTERRATINGSBUTTONWIDGET_H
+
+#include <memory>
 
 #include <Nux/Nux.h>
-#include <Nux/Button.h>
+#include <Nux/ToggleButton.h>
 #include <Nux/CairoWrapper.h>
 #include <UnityCore/RatingsFilter.h>
 
-#include "FilterWidget.h"
-
-namespace unity {
-
-  class FilterRatingsButton : public nux::Button, public unity::FilterWidget {
-  public:
-    FilterRatingsButton (NUX_FILE_LINE_PROTO);
-    virtual ~FilterRatingsButton();
-
-    void SetFilter (dash::Filter::Ptr filter);
-    dash::RatingsFilter::Ptr GetFilter ();
-    std::string GetFilterType ();
-
-  protected:
-    virtual long ComputeContentSize ();
-    virtual void Draw(nux::GraphicsEngine& GfxContext, bool force_draw);
-    virtual void DrawContent(nux::GraphicsEngine& GfxContext, bool force_draw);
-    virtual void PostDraw(nux::GraphicsEngine& GfxContext, bool force_draw);
-
-    void InitTheme ();
-
-    //void RecvMouseDown (int x, int y, unsigned long button_flags, unsigned long key_flags);
-    void RecvMouseUp (int x, int y, unsigned long button_flags, unsigned long key_flags);
-    void RecvMouseDrag (int x, int y, int dx, int dy, unsigned long button_flags, unsigned long key_flags);
-    void OnRatingsChanged (int rating);
-
-    nux::CairoWrapper *prelight_empty_;
-    nux::CairoWrapper *active_empty_;
-    nux::CairoWrapper *normal_empty_;
-    nux::CairoWrapper *prelight_half_;
-    nux::CairoWrapper *active_half_;
-    nux::CairoWrapper *normal_half_;
-    nux::CairoWrapper *prelight_full_;
-    nux::CairoWrapper *active_full_;
-    nux::CairoWrapper *normal_full_;
-    nux::Geometry cached_geometry_;
-
-    void RedrawTheme (nux::Geometry const& geom, cairo_t *cr, int type, nux::ButtonVisualState faked_state);
-
-    dash::RatingsFilter::Ptr filter_;
-
-  };
-
-}
-
-#endif // FILTERRATINGSBUTTONWIDGET_H
+namespace unity
+{
+namespace dash
+{
+
+class FilterRatingsButton : public nux::ToggleButton
+{
+public:
+  FilterRatingsButton(NUX_FILE_LINE_PROTO);
+  virtual ~FilterRatingsButton();
+
+  void SetFilter(Filter::Ptr const& filter);
+  RatingsFilter::Ptr GetFilter();
+  std::string GetFilterType();
+
+protected:
+  virtual long ComputeContentSize();
+  virtual void Draw(nux::GraphicsEngine& GfxContext, bool force_draw);
+
+  void InitTheme();
+  void RedrawTheme(nux::Geometry const& geom, cairo_t* cr, int type, nux::ButtonVisualState faked_state);
+
+  void RecvMouseUp(int x, int y, unsigned long button_flags, unsigned long key_flags);
+  void RecvMouseDrag(int x, int y, int dx, int dy, unsigned long button_flags, unsigned long key_flags);
+  void OnRatingsChanged(int rating);
+
+  typedef std::unique_ptr<nux::CairoWrapper> NuxCairoPtr;
+
+  NuxCairoPtr active_empty_;
+  NuxCairoPtr normal_empty_;
+  NuxCairoPtr prelight_empty_;
+  NuxCairoPtr active_half_;
+  NuxCairoPtr normal_half_;
+  NuxCairoPtr prelight_half_;
+  NuxCairoPtr active_full_;
+  NuxCairoPtr normal_full_;
+  NuxCairoPtr prelight_full_;
+  nux::Geometry cached_geometry_;
+
+  dash::RatingsFilter::Ptr filter_;
+
+};
+
+} // namespace dash
+} // namespace unity
+
+#endif // UNITYSHELL_FILTERRATINGSBUTTONWIDGET_H
+

=== modified file 'plugins/unityshell/src/FilterRatingsWidget.cpp'
--- plugins/unityshell/src/FilterRatingsWidget.cpp	2011-10-11 18:18:13 +0000
+++ plugins/unityshell/src/FilterRatingsWidget.cpp	2012-01-11 09:37:33 +0000
@@ -20,8 +20,6 @@
  *
  */
 
-#include "config.h"
-
 #include <Nux/Nux.h>
 #include <glib.h>
 #include <glib/gi18n-lib.h>
@@ -32,92 +30,64 @@
 #include "FilterRatingsButton.h"
 #include "FilterRatingsWidget.h"
 
-
-namespace unity {
+namespace unity
+{
+namespace dash
+{
 
 NUX_IMPLEMENT_OBJECT_TYPE(FilterRatingsWidget);
 
-  FilterRatingsWidget::FilterRatingsWidget (NUX_FILE_LINE_DECL)
-      : FilterExpanderLabel (_("Rating"), NUX_FILE_LINE_PARAM),
-        last_rating_ (0.0f)
-  {
-    any_button_ = new FilterBasicButton(_("All"), NUX_TRACKER_LOCATION);
-    any_button_->state_change.connect(sigc::mem_fun(this, &FilterRatingsWidget::OnAnyButtonActivated));
-    any_button_->SetLabel(_("All"));
-
-    SetRightHandView(any_button_);
-
-    nux::VLayout* layout = new nux::VLayout (NUX_TRACKER_LOCATION);
-    ratings_ = new FilterRatingsButton (NUX_TRACKER_LOCATION);
-
-    layout->AddView(ratings_);
-    SetContents(layout);
-  }
-
-  FilterRatingsWidget::~FilterRatingsWidget()
-  {
-  }
-
-  void FilterRatingsWidget::OnAnyButtonActivated(nux::View *view)
-  {
-    if (any_button_->Active())
-    {
-      last_rating_ = filter_->rating;
-      // we need to make sure the property changes, otherwise there'll be no
-      // signals, so we'll set it to 0.0f
-      filter_->rating = 0.0f;
-      filter_->Clear();
-    }
-    else
-    {
-      filter_->rating = last_rating_;
-    }
-  }
-
-  void FilterRatingsWidget::OnFilterRatingChanged(float new_rating)
-  {
-    if (new_rating <= 0.0f)
-    {
-      any_button_->SetActive(true);
-    }
-    else
-    {
-      any_button_->SetActive(false);
-    }
-  }
-
-  void FilterRatingsWidget::SetFilter (dash::Filter::Ptr filter)
-  {
-    filter_ = std::static_pointer_cast<dash::RatingsFilter>(filter);
-    filter_->rating.changed.connect (sigc::mem_fun (this, &FilterRatingsWidget::OnFilterRatingChanged));
-    ratings_->SetFilter(filter);
-    SetLabel(filter_->name);
-    NeedRedraw();
-  }
-
-  std::string FilterRatingsWidget::GetFilterType ()
-  {
-    return "FilterRatingsWidget";
-  }
-
-  void FilterRatingsWidget::Draw(nux::GraphicsEngine& GfxContext, bool force_draw) {
-    nux::Geometry geo = GetGeometry();
-
-    GfxContext.PushClippingRectangle(geo);
-    nux::GetPainter().PaintBackground(GfxContext, geo);
-    GfxContext.PopClippingRectangle();
-  }
-
-  void FilterRatingsWidget::DrawContent(nux::GraphicsEngine& GfxContext, bool force_draw) {
-    GfxContext.PushClippingRectangle(GetGeometry());
-
-    GetLayout()->ProcessDraw(GfxContext, force_draw);
-
-    GfxContext.PopClippingRectangle();
-  }
-
-  void FilterRatingsWidget::PostDraw(nux::GraphicsEngine& GfxContext, bool force_draw) {
-    nux::View::PostDraw(GfxContext, force_draw);
-  }
-
-};
+FilterRatingsWidget::FilterRatingsWidget(NUX_FILE_LINE_DECL)
+  : FilterExpanderLabel(_("Rating"), NUX_FILE_LINE_PARAM)
+{
+  all_button_ = new FilterAllButton(NUX_TRACKER_LOCATION);
+
+  nux::VLayout* layout = new nux::VLayout(NUX_TRACKER_LOCATION);
+  layout->SetTopAndBottomPadding(10, 0);
+  ratings_ = new FilterRatingsButton(NUX_TRACKER_LOCATION);
+
+  layout->AddView(ratings_);
+
+  SetRightHandView(all_button_);
+  SetContents(layout);
+}
+
+FilterRatingsWidget::~FilterRatingsWidget()
+{
+}
+
+void FilterRatingsWidget::SetFilter(Filter::Ptr const& filter)
+{
+  filter_ = std::static_pointer_cast<RatingsFilter>(filter);
+
+  all_button_->SetFilter(filter_);
+  expanded = !filter_->collapsed();
+  ratings_->SetFilter(filter_);
+
+  SetLabel(filter_->name);
+  NeedRedraw();
+}
+
+std::string FilterRatingsWidget::GetFilterType()
+{
+  return "FilterRatingsWidget";
+}
+
+void FilterRatingsWidget::Draw(nux::GraphicsEngine& GfxContext, bool force_draw)
+{
+  nux::Geometry const& geo = GetGeometry();
+
+  GfxContext.PushClippingRectangle(geo);
+  nux::GetPainter().PaintBackground(GfxContext, geo);
+  GfxContext.PopClippingRectangle();
+}
+
+void FilterRatingsWidget::DrawContent(nux::GraphicsEngine& GfxContext, bool force_draw)
+{
+  GfxContext.PushClippingRectangle(GetGeometry());
+  GetLayout()->ProcessDraw(GfxContext, force_draw);
+  GfxContext.PopClippingRectangle();
+}
+
+} // namespace dash
+} // namespace unity

=== modified file 'plugins/unityshell/src/FilterRatingsWidget.h'
--- plugins/unityshell/src/FilterRatingsWidget.h	2011-10-11 18:18:13 +0000
+++ plugins/unityshell/src/FilterRatingsWidget.h	2012-01-11 09:37:33 +0000
@@ -20,10 +20,8 @@
  *
  */
 
-
-
-#ifndef FILTERRATINGSWIDGET_H
-#define FILTERRATINGSWIDGET_H
+#ifndef UNITYSHELL_FILTERRATINGSWIDGET_H
+#define UNITYSHELL_FILTERRATINGSWIDGET_H
 
 #include <Nux/Nux.h>
 #include <Nux/GridHLayout.h>
@@ -31,42 +29,37 @@
 #include <Nux/VLayout.h>
 #include <UnityCore/RatingsFilter.h>
 
-#include "FilterWidget.h"
+#include "FilterAllButton.h"
 #include "FilterExpanderLabel.h"
 
-namespace unity {
-  class FilterBasicButton;
-  class FilterRatingsButton;
-
-  class FilterRatingsWidget : public FilterExpanderLabel, public FilterWidget
-  {
-    NUX_DECLARE_OBJECT_TYPE(FilterRatingsWidget, FilterExpanderLabel);
-  public:
-    FilterRatingsWidget (NUX_FILE_LINE_PROTO);
-    virtual ~FilterRatingsWidget();
-
-    void SetFilter (dash::Filter::Ptr filter);
-    std::string GetFilterType ();
-
-    nux::Property<int> rating;
-
-  protected:
-    virtual void Draw(nux::GraphicsEngine& GfxContext, bool force_draw);
-    virtual void DrawContent(nux::GraphicsEngine& GfxContext, bool force_draw);
-    virtual void PostDraw(nux::GraphicsEngine& GfxContext, bool force_draw);
-
-    void OnRatingsRatingChanged(const int& new_rating);
-    void OnFilterRatingChanged(float new_rating);
-    void OnAnyButtonActivated(nux::View *view);
-
-    FilterBasicButton *any_button_;
-    FilterRatingsButton *ratings_;
-    dash::RatingsFilter::Ptr filter_;
-
-  private:
-    float last_rating_;
-  };
-
-}
-
-#endif // FILTERRATINGSWIDGET_H
+namespace unity
+{
+namespace dash
+{
+
+class FilterBasicButton;
+class FilterRatingsButton;
+
+class FilterRatingsWidget : public FilterExpanderLabel
+{
+  NUX_DECLARE_OBJECT_TYPE(FilterRatingsWidget, FilterExpanderLabel);
+public:
+  FilterRatingsWidget(NUX_FILE_LINE_PROTO);
+  virtual ~FilterRatingsWidget();
+
+  void SetFilter(Filter::Ptr const& filter);
+  std::string GetFilterType();
+
+protected:
+  virtual void Draw(nux::GraphicsEngine& GfxContext, bool force_draw);
+  virtual void DrawContent(nux::GraphicsEngine& GfxContext, bool force_draw);
+
+  FilterAllButton* all_button_;
+  FilterRatingsButton* ratings_;
+  RatingsFilter::Ptr filter_;
+};
+
+} // namespace dash
+} // namespace unity
+
+#endif // UNITYSHELL_FILTERRATINGSWIDGET_H

=== added file 'plugins/unityshell/src/FilterWidget.cpp'
--- plugins/unityshell/src/FilterWidget.cpp	1970-01-01 00:00:00 +0000
+++ plugins/unityshell/src/FilterWidget.cpp	2012-01-11 09:37:33 +0000
@@ -0,0 +1,38 @@
+// -*- Mode: C++; indent-tabs-mode: nil; tab-width: 2 -*-
+/*
+ * Copyright 2011 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser 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 warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the applicable version of the GNU Lesser General Public
+ * License for more details.
+ *
+ * You should have received a copy of both the GNU Lesser General Public
+ * License version 3 along with this program.  If not, see
+ * <http://www.gnu.org/licenses/>
+ *
+ * Authored by: Andrea Azzarone <[e-mail]>
+ *
+ */
+
+#include "FilterWidget.h"
+
+namespace unity
+{
+namespace dash
+{
+
+NUX_IMPLEMENT_OBJECT_TYPE(FilterWidget);
+
+FilterWidget::FilterWidget( NUX_FILE_LINE_DECL)
+  : nux::View(NUX_FILE_LINE_PARAM)
+{
+}
+
+} // namespace dash
+} // namespace unity

=== modified file 'plugins/unityshell/src/FilterWidget.h'
--- plugins/unityshell/src/FilterWidget.h	2011-09-12 03:57:01 +0000
+++ plugins/unityshell/src/FilterWidget.h	2012-01-11 09:37:33 +0000
@@ -19,24 +19,30 @@
  * Authored by: Gordon Allott <[e-mail]>
  *
  */
-#ifndef UNITY_FILTERWIDGET_H
-#define UNITY_FILTERWIDGET_H
+#ifndef UNITYSHELL_FILTERWIDGET_H
+#define UNITYSHELL_FILTERWIDGET_H
 
+#include <Nux/Nux.h>
 #include <Nux/View.h>
 #include <UnityCore/Filter.h>
 
-
 namespace unity
 {
+namespace dash
+{
 
-class FilterWidget
+class FilterWidget : public nux::View
 {
+  NUX_DECLARE_OBJECT_TYPE(FilterWidget, nux::View);
 public:
-  virtual ~FilterWidget () {}
-  virtual void SetFilter (dash::Filter::Ptr filter) = 0;
-  virtual std::string GetFilterType () = 0;
+  FilterWidget(NUX_FILE_LINE_PROTO);
+  virtual ~FilterWidget() {};
+
+  virtual void SetFilter(Filter::Ptr const& filter) = 0;
+  virtual std::string GetFilterType() = 0;
 };
 
-}
+} // namespace dash
+} // namespace unity
 
-#endif
+#endif //UNITYSHELL_FILTERWIDGET_H