Merge lp:~3v1n0/unity/quicklist-menuitem-clanup into lp:unity

[Marco Trevisan (Treviño)]

QuicklistMenuItem: remove debug bits, factorize duplicated code, remove friendship, use smart pointers

  Removed a lot of duplicated code between implementations, use top-level factorized code, use enum class,
  c++ types and better pointer deletions
  Tests updated

Main QuicklistMenuItem cleanup, removing a lot of duplicated code, friendships and using smart pointers and c++ strings...

Tests rewritten and moved to gtest.

[Tim Penhey (thumper)]

On the whole this looks really good.

I'm going to assume that you have actually run and tested all the quick list options.

review: Approve

=== modified file 'launcher/QuicklistMenuItem.cpp'
--- launcher/QuicklistMenuItem.cpp	2012-05-14 02:08:47 +0000
+++ launcher/QuicklistMenuItem.cpp	2012-08-13 14:28:23 +0000
@@ -1,6 +1,6 @@
 // -*- Mode: C++; indent-tabs-mode: nil; tab-width: 2 -*-
 /*
- * Copyright (C) 2010 Canonical Ltd
+ * Copyright (C) 2010-2012 Canonical Ltd
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
@@ -16,322 +16,133 @@
  *
  * Authored by: Mirco Müller <[e-mail]>
  *              Jay Taoko <[e-mail]>
- *              Marco Trevisan (Treviño) <[e-mail]>
+ *              Marco Trevisan <[e-mail]>
  */
 
-#include <gdk/gdk.h>
 #include <gtk/gtk.h>
-
-#include <Nux/Nux.h>
+#include <UnityCore/Variant.h>
+#include "unity-shared/UBusWrapper.h"
+#include "unity-shared/UBusMessages.h"
 
 #include "QuicklistMenuItem.h"
-#include <UnityCore/Variant.h>
-
-#include <X11/Xlib.h>
 
 namespace unity
 {
 
 NUX_IMPLEMENT_OBJECT_TYPE(QuicklistMenuItem);
 
-static void
-OnPropertyChanged(gchar*             property,
-                  GValue*            value,
-                  QuicklistMenuItem* self);
-
-static void
-OnItemActivated(guint              timestamp,
-                QuicklistMenuItem* self);
-
-QuicklistMenuItem::QuicklistMenuItem(DbusmenuMenuitem* item,
-                                     NUX_FILE_LINE_DECL) :
-  View(NUX_FILE_LINE_PARAM)
-{
-  if (item == 0)
-  {
-    g_warning("Invalid DbusmenuMenuitem in file %s at line %s.", G_STRFUNC, G_STRLOC);
-  }
-
-  Initialize(item, false);
-}
-
-QuicklistMenuItem::QuicklistMenuItem(DbusmenuMenuitem* item,
-                                     bool              debug,
-                                     NUX_FILE_LINE_DECL) :
-  View(NUX_FILE_LINE_PARAM)
-{
-  Initialize(item, debug);
-}
-
-void
-QuicklistMenuItem::Initialize(DbusmenuMenuitem* item, bool debug)
-{
-  _text        = "";
-  _color       = nux::Color(1.0f, 1.0f, 1.0f, 1.0f);
-  _menuItem    = DBUSMENU_MENUITEM(g_object_ref(item));
-  _debug       = debug;
-  _item_type   = MENUITEM_TYPE_UNKNOWN;
-
-  _normalTexture[0]   = NULL;
-  _normalTexture[1]   = NULL;
-  _prelightTexture[0] = NULL;
-  _prelightTexture[1] = NULL;
-
-  if (_menuItem)
-  {
-    g_signal_connect(_menuItem,
-                     "property-changed",
-                     G_CALLBACK(OnPropertyChanged),
-                     this);
-    g_signal_connect(_menuItem,
-                     "item-activated",
-                     G_CALLBACK(OnItemActivated),
-                     this);
-  }
-
+QuicklistMenuItem::QuicklistMenuItem(QuicklistMenuItemType type, DbusmenuMenuitem* item, NUX_FILE_LINE_DECL)
+  : nux::View(NUX_FILE_LINE_PARAM)
+  , _item_type(type)
+  , _menu_item(item, glib::AddRef())
+  , _prelight(false)
+{
   mouse_up.connect(sigc::mem_fun(this, &QuicklistMenuItem::RecvMouseUp));
   mouse_click.connect(sigc::mem_fun(this, &QuicklistMenuItem::RecvMouseClick));
   mouse_drag.connect(sigc::mem_fun(this, &QuicklistMenuItem::RecvMouseDrag));
   mouse_enter.connect(sigc::mem_fun(this, &QuicklistMenuItem::RecvMouseEnter));
   mouse_leave.connect(sigc::mem_fun(this, &QuicklistMenuItem::RecvMouseLeave));
-
-  _prelight = false;
 }
 
 QuicklistMenuItem::~QuicklistMenuItem()
-{
-  if (_normalTexture[0])
-    _normalTexture[0]->UnReference();
-
-  if (_normalTexture[1])
-    _normalTexture[1]->UnReference();
-
-  if (_prelightTexture[0])
-    _prelightTexture[0]->UnReference();
-
-  if (_prelightTexture[1])
-    _prelightTexture[1]->UnReference();
-
-  if (_menuItem)
-    g_object_unref(_menuItem);
-}
-
-const gchar*
-QuicklistMenuItem::GetDefaultText()
-{
-  return NULL;
-}
-
-void
-QuicklistMenuItem::InitializeText()
-{
-  if (_menuItem)
+{}
+
+std::string QuicklistMenuItem::GetDefaultText() const
+{
+  return "";
+}
+
+void QuicklistMenuItem::InitializeText()
+{
+  if (_menu_item)
     _text = GetText();
   else
     _text = GetDefaultText();
 
-  int textWidth = 1;
-  int textHeight = 1;
-  GetTextExtents(textWidth, textHeight);
-  SetMinimumSize(textWidth + ITEM_INDENT_ABS + 3 * ITEM_MARGIN,
-                 textHeight + 2 * ITEM_MARGIN);
+  // This is needed to setup the item size values
+  nux::CairoGraphics cairoGraphics(CAIRO_FORMAT_A1, 1, 1);
+  DrawText(cairoGraphics, 1, 1, nux::color::White);
 }
 
-QuicklistMenuItemType QuicklistMenuItem::GetItemType()
+QuicklistMenuItemType QuicklistMenuItem::GetItemType() const
 {
   return _item_type;
 }
 
-void
-QuicklistMenuItem::PreLayoutManagement()
-{
-  View::PreLayoutManagement();
-}
-
-long
-QuicklistMenuItem::PostLayoutManagement(long layoutResult)
-{
-  long result = View::PostLayoutManagement(layoutResult);
-
-  return result;
-}
-
-void
-QuicklistMenuItem::Draw(nux::GraphicsEngine& gfxContext,
-                        bool                 forceDraw)
-{
-}
-
-void
-QuicklistMenuItem::DrawContent(nux::GraphicsEngine& gfxContext,
-                               bool                 forceDraw)
-{
-}
-
-void
-QuicklistMenuItem::PostDraw(nux::GraphicsEngine& gfxContext,
-                            bool                 forceDraw)
-{
-}
-
-const gchar*
-QuicklistMenuItem::GetLabel()
-{
-  if (_menuItem == 0)
-    return 0;
-  return dbusmenu_menuitem_property_get(_menuItem,
-                                        DBUSMENU_MENUITEM_PROP_LABEL);
-}
-
-bool
-QuicklistMenuItem::GetEnabled()
-{
-  if (_menuItem == 0)
-    return false;
-  return dbusmenu_menuitem_property_get_bool(_menuItem,
-                                             DBUSMENU_MENUITEM_PROP_ENABLED);
-}
-
-bool
-QuicklistMenuItem::GetActive()
-{
-  if (_menuItem == 0)
-    return false;
-  return dbusmenu_menuitem_property_get_int(_menuItem,
-                                            DBUSMENU_MENUITEM_PROP_TOGGLE_STATE) == DBUSMENU_MENUITEM_TOGGLE_STATE_CHECKED;
-}
-
-bool
-QuicklistMenuItem::GetVisible()
-{
-  if (_menuItem == 0)
-    return false;
-  return dbusmenu_menuitem_property_get_bool(_menuItem,
-                                             DBUSMENU_MENUITEM_PROP_VISIBLE);
-}
-
-bool
-QuicklistMenuItem::GetSelectable()
+std::string QuicklistMenuItem::GetLabel() const
+{
+  if (!_menu_item)
+    return "";
+
+  const char *label = dbusmenu_menuitem_property_get(_menu_item, DBUSMENU_MENUITEM_PROP_LABEL);
+
+  return label ? label : "";
+}
+
+bool QuicklistMenuItem::GetEnabled() const
+{
+  if (!_menu_item)
+    return false;
+
+  return dbusmenu_menuitem_property_get_bool(_menu_item, DBUSMENU_MENUITEM_PROP_ENABLED);
+}
+
+bool QuicklistMenuItem::GetActive() const
+{
+  if (!_menu_item)
+    return false;
+
+  int toggle = dbusmenu_menuitem_property_get_int(_menu_item, DBUSMENU_MENUITEM_PROP_TOGGLE_STATE);
+
+  return (toggle == DBUSMENU_MENUITEM_TOGGLE_STATE_CHECKED);
+}
+
+bool QuicklistMenuItem::GetVisible() const
+{
+  if (!_menu_item)
+    return false;
+
+  return dbusmenu_menuitem_property_get_bool(_menu_item, DBUSMENU_MENUITEM_PROP_VISIBLE);
+}
+
+bool QuicklistMenuItem::GetSelectable() const
 {
   return GetVisible() && GetEnabled();
 }
 
-void QuicklistMenuItem::ItemActivated()
-{
-  if (_debug)
-    sigChanged.emit(*this);
-
-  std::cout << "ItemActivated() called" << std::endl;
-}
-
-gchar* QuicklistMenuItem::GetText()
-{
-  const gchar *label;
-  gchar *text;
-
-  if (!_menuItem)
-    return NULL;
-
-  label = GetLabel();
-
-  if (!label)
-    return NULL;
+std::string QuicklistMenuItem::GetText() const
+{
+  std::string const& label = GetLabel();
+
+  if (label.empty())
+    return "";
 
   if (!IsMarkupEnabled())
   {
-    text = g_markup_escape_text(label, -1);
-  }
-  else
-  {
-    text = g_strdup(label);
-  }
-
-  return text;
-}
-
-void QuicklistMenuItem::GetTextExtents(int& width, int& height)
-{
-  GtkSettings* settings = gtk_settings_get_default();  // not ref'ed
-  gchar*       fontName = NULL;
-
-  g_object_get(settings, "gtk-font-name", &fontName, NULL);
-  GetTextExtents(fontName, width, height);
-  g_free(fontName);
-}
-
-void QuicklistMenuItem::GetTextExtents(const gchar* font,
-                                       int&         width,
-                                       int&         height)
-{
-  cairo_surface_t*      surface  = NULL;
-  cairo_t*              cr       = NULL;
-  PangoLayout*          layout   = NULL;
-  PangoFontDescription* desc     = NULL;
-  PangoContext*         pangoCtx = NULL;
-  PangoRectangle        logRect  = {0, 0, 0, 0};
-  int                   dpi      = 0;
-  GdkScreen*            screen   = gdk_screen_get_default();    // is not ref'ed
-  GtkSettings*          settings = gtk_settings_get_default();  // is not ref'ed
-
-  // sanity check
-  if (!font)
-    return;
-
-  if (_text == "")
-    return;
-
-  surface = cairo_image_surface_create(CAIRO_FORMAT_A1, 1, 1);
-  cr = cairo_create(surface);
-  cairo_set_font_options(cr, gdk_screen_get_font_options(screen));
-  layout = pango_cairo_create_layout(cr);
-  desc = pango_font_description_from_string(font);
-  pango_font_description_set_weight(desc, PANGO_WEIGHT_NORMAL);
-  pango_layout_set_font_description(layout, desc);
-  pango_layout_set_wrap(layout, PANGO_WRAP_WORD_CHAR);
-  pango_layout_set_ellipsize(layout, PANGO_ELLIPSIZE_END);
-  pango_layout_set_markup_with_accel(layout, _text.c_str(), -1, '_', NULL);
-  pangoCtx = pango_layout_get_context(layout);  // is not ref'ed
-  pango_cairo_context_set_font_options(pangoCtx,
-                                       gdk_screen_get_font_options(screen));
-  g_object_get(settings, "gtk-xft-dpi", &dpi, NULL);
-  if (dpi == -1)
-  {
-    // use some default DPI-value
-    pango_cairo_context_set_resolution(pangoCtx, 96.0f);
-  }
-  else
-  {
-    pango_cairo_context_set_resolution(pangoCtx,
-                                       (float) dpi / (float) PANGO_SCALE);
-  }
-  pango_layout_context_changed(layout);
-  pango_layout_get_extents(layout, NULL, &logRect);
-
-  width  = logRect.width / PANGO_SCALE;
-  height = logRect.height / PANGO_SCALE;
-
-  // clean up
-  pango_font_description_free(desc);
-  g_object_unref(layout);
-  cairo_destroy(cr);
-  cairo_surface_destroy(surface);
-}
-
-static void
-OnPropertyChanged(gchar*             property,
-                  GValue*            value,
-                  QuicklistMenuItem* self)
-{
-  //todo
-  //self->UpdateTexture ();
-}
-
-static void
-OnItemActivated(guint              timestamp,
-                QuicklistMenuItem* self)
-{
-  //todo:
-  //self->ItemActivated ();
+    return glib::String(g_markup_escape_text(label.c_str(), -1)).Str();
+  }
+
+  return label;
+}
+
+void QuicklistMenuItem::Activate() const
+{
+  if (!_menu_item)
+    return;
+
+  dbusmenu_menuitem_handle_event(_menu_item, "clicked", nullptr, 0);
+  UBusManager manager;
+  manager.SendMessage(UBUS_PLACE_VIEW_CLOSE_REQUEST);
+}
+
+void QuicklistMenuItem::Select(bool select)
+{
+  _prelight = select;
+}
+
+bool QuicklistMenuItem::IsSelected() const
+{
+  return _prelight;
 }
 
 void QuicklistMenuItem::RecvMouseUp(int x, int y, unsigned long button_flags, unsigned long key_flags)
@@ -342,9 +153,8 @@
 void QuicklistMenuItem::RecvMouseClick(int x, int y, unsigned long button_flags, unsigned long key_flags)
 {
   if (!GetEnabled())
-  {
     return;
-  }
+
   sigMouseClick.emit(this, x, y);
 }
 
@@ -363,38 +173,115 @@
   sigMouseLeave.emit(this);
 }
 
-void QuicklistMenuItem::DrawText(nux::CairoGraphics* cairo, int width, int height, nux::Color const& color)
-{
-  if (_text == "" || cairo == nullptr)
-    return;
-
-  cairo_t*              cr         = cairo->GetContext();
-  int                   textWidth  = 0;
-  int                   textHeight = 0;
-  PangoLayout*          layout     = NULL;
-  PangoFontDescription* desc       = NULL;
-  PangoContext*         pangoCtx   = NULL;
-  int                   dpi        = 0;
-  GdkScreen*            screen     = gdk_screen_get_default();    // not ref'ed
-  GtkSettings*          settings   = gtk_settings_get_default();  // not ref'ed
-  gchar*                fontName   = NULL;
-
-  g_object_get(settings, "gtk-font-name", &fontName, NULL);
-  GetTextExtents(fontName, textWidth, textHeight);
-
+void QuicklistMenuItem::PreLayoutManagement()
+{
+  _pre_layout_width = GetBaseWidth();
+  _pre_layout_height = GetBaseHeight();
+
+  if (!_normalTexture[0])
+  {
+    UpdateTexture();
+  }
+
+  View::PreLayoutManagement();
+}
+
+long QuicklistMenuItem::PostLayoutManagement(long layoutResult)
+{
+  int w = GetBaseWidth();
+  int h = GetBaseHeight();
+
+  long result = 0;
+
+  if (_pre_layout_width < w)
+    result |= nux::eLargerWidth;
+  else if (_pre_layout_width > w)
+    result |= nux::eSmallerWidth;
+  else
+    result |= nux::eCompliantWidth;
+
+  if (_pre_layout_height < h)
+    result |= nux::eLargerHeight;
+  else if (_pre_layout_height > h)
+    result |= nux::eSmallerHeight;
+  else
+    result |= nux::eCompliantHeight;
+
+  return result;
+}
+
+void QuicklistMenuItem::Draw(nux::GraphicsEngine& gfxContext, bool forceDraw)
+{
+  // Check if the texture have been computed. If they haven't, exit the function.
+  if (!_normalTexture[0] || !_prelightTexture[0])
+    return;
+
+  nux::Geometry const& base = GetGeometry();
+
+  gfxContext.PushClippingRectangle(base);
+
+  nux::TexCoordXForm texxform;
+  texxform.SetWrap(nux::TEXWRAP_REPEAT, nux::TEXWRAP_REPEAT);
+  texxform.SetTexCoordType(nux::TexCoordXForm::OFFSET_COORD);
+
+  gfxContext.GetRenderStates().SetBlend(true);
+  gfxContext.GetRenderStates().SetPremultipliedBlend(nux::SRC_OVER);
+
+  nux::ObjectPtr<nux::IOpenGLBaseTexture> texture;
+  unsigned int texture_idx = GetActive() ? 1 : 0;
+  bool enabled = GetEnabled();
+
+  if (!_prelight || !enabled)
+  {
+    texture = _normalTexture[texture_idx]->GetDeviceTexture();
+  }
+  else
+  {
+    texture = _prelightTexture[texture_idx]->GetDeviceTexture();
+  }
+
+  nux::Color const& color = enabled ? nux::color::White : nux::color::White * 0.35;
+
+  gfxContext.QRP_1Tex(base.x, base.y, base.width, base.height, texture, texxform, color);
+  gfxContext.GetRenderStates().SetBlend(false);
+  gfxContext.PopClippingRectangle();
+}
+
+nux::Size const& QuicklistMenuItem::GetTextExtents() const
+{
+  return _text_extents;
+}
+
+void QuicklistMenuItem::DrawText(nux::CairoGraphics& cairo, int width, int height, nux::Color const& color)
+{
+  if (_text.empty())
+    return;
+
+  GdkScreen* screen = gdk_screen_get_default(); // not ref'ed
+  GtkSettings* settings = gtk_settings_get_default(); // not ref'ed
+
+  glib::String font_name;
+  g_object_get(settings, "gtk-font-name", &font_name, nullptr);
+
+  std::shared_ptr<cairo_t> cairo_context(cairo.GetContext(), cairo_destroy);
+  cairo_t* cr = cairo_context.get();
   cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
   cairo_set_source_rgba(cr, color.red, color.blue, color.green, color.alpha);
   cairo_set_font_options(cr, gdk_screen_get_font_options(screen));
-  layout = pango_cairo_create_layout(cr);
-  desc = pango_font_description_from_string(fontName);
-  pango_layout_set_font_description(layout, desc);
+
+  glib::Object<PangoLayout> layout(pango_cairo_create_layout(cr));
+  std::shared_ptr<PangoFontDescription> desc(pango_font_description_from_string(font_name), pango_font_description_free);
+  pango_layout_set_font_description(layout, desc.get());
   pango_layout_set_wrap(layout, PANGO_WRAP_WORD_CHAR);
   pango_layout_set_ellipsize(layout, PANGO_ELLIPSIZE_END);
-  pango_layout_set_markup_with_accel(layout, _text.c_str(), -1, '_', NULL);
-  pangoCtx = pango_layout_get_context(layout);  // is not ref'ed
-  pango_cairo_context_set_font_options(pangoCtx,
-                                       gdk_screen_get_font_options(screen));
-  g_object_get(settings, "gtk-xft-dpi", &dpi, NULL);
+  pango_layout_set_markup_with_accel(layout, _text.c_str(), -1, '_', nullptr);
+
+  PangoContext* pangoCtx = pango_layout_get_context(layout);  // is not ref'ed
+  pango_cairo_context_set_font_options(pangoCtx, gdk_screen_get_font_options(screen));
+
+  int dpi = 0;
+  g_object_get(settings, "gtk-xft-dpi", &dpi, nullptr);
+
   if (dpi == -1)
   {
     // use some default DPI-value
@@ -402,68 +289,79 @@
   }
   else
   {
-    pango_cairo_context_set_resolution(pangoCtx,
-                                       (float) dpi / (float) PANGO_SCALE);
+    pango_cairo_context_set_resolution(pangoCtx, static_cast<float>(dpi) / static_cast<float>(PANGO_SCALE));
   }
 
   pango_layout_context_changed(layout);
-
-  cairo_move_to(cr,
-                2 * ITEM_MARGIN + ITEM_INDENT_ABS,
-                (float)(height - textHeight) / 2.0f);
+  PangoRectangle log_rect  = {0, 0, 0, 0};
+  pango_layout_get_extents(layout, nullptr, &log_rect);
+
+  int text_width  = log_rect.width / PANGO_SCALE;
+  int text_height = log_rect.height / PANGO_SCALE;
+
+  _text_extents.width = text_width + ITEM_INDENT_ABS + 3 * ITEM_MARGIN;
+  _text_extents.height = text_height + 2 * ITEM_MARGIN;
+
+  SetMinimumSize(_text_extents.width, _text_extents.height);
+
+  cairo_move_to(cr, 2 * ITEM_MARGIN + ITEM_INDENT_ABS, static_cast<float>(height - text_height) / 2.0f);
   pango_cairo_show_layout(cr, layout);
-
-  // clean up
-  pango_font_description_free(desc);
-  g_free(fontName);
-  g_object_unref(layout);
-  cairo_destroy(cr);
 }
 
-void QuicklistMenuItem::DrawPrelight(nux::CairoGraphics* cairo, int width, int height, nux::Color const& color)
+void QuicklistMenuItem::DrawPrelight(nux::CairoGraphics& cairo, int width, int height, nux::Color const& color)
 {
-  if (!cairo)
-    return;
-
-  cairo_t* cr = cairo->GetContext();
+  std::shared_ptr<cairo_t> cairo_context(cairo.GetContext(), cairo_destroy);
+  cairo_t* cr = cairo_context.get();
 
   cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
   cairo_set_source_rgba(cr, color.red, color.blue, color.green, color.alpha);
-  cairo->DrawRoundedRectangle(cr, 1.0f, 0.0f, 0.0f, ITEM_CORNER_RADIUS_ABS,
-                              width, height);
+  cairo.DrawRoundedRectangle(cr, 1.0f, 0.0f, 0.0f, ITEM_CORNER_RADIUS_ABS, width, height);
   cairo_fill(cr);
-  cairo_destroy(cr);
-}
-
-void
-QuicklistMenuItem::EnableLabelMarkup(bool enabled)
+}
+
+double QuicklistMenuItem::Align(double val)
+{
+  const double fract = val - static_cast<int>(val);
+
+  if (fract != 0.5f)
+    return static_cast<double>(static_cast<int>(val) + 0.5f);
+  else
+    return val;
+}
+
+void QuicklistMenuItem::EnableLabelMarkup(bool enabled)
 {
   if (IsMarkupEnabled() != enabled)
   {
-    dbusmenu_menuitem_property_set_bool(_menuItem, "unity-use-markup", enabled);
+    dbusmenu_menuitem_property_set_bool(_menu_item, "unity-use-markup", enabled);
 
     _text = "";
     InitializeText();
   }
 }
 
-bool
-QuicklistMenuItem::IsMarkupEnabled()
+bool QuicklistMenuItem::IsMarkupEnabled() const
 {
-  gboolean markup;
-
-  if (!_menuItem)
+  if (!_menu_item)
     return false;
 
-  markup = dbusmenu_menuitem_property_get_bool(_menuItem, "unity-use-markup");
+  gboolean markup = dbusmenu_menuitem_property_get_bool(_menu_item, "unity-use-markup");
   return (markup != FALSE);
 }
 
+unsigned QuicklistMenuItem::GetCairoSurfaceWidth() const
+{
+  if (!_normalTexture[0])
+    return 0;
+
+  return _normalTexture[0]->GetWidth();
+}
+
 // Introspection
 
 std::string QuicklistMenuItem::GetName() const
 {
-  return _name;
+  return "QuicklistMenuItem";
 }
 
 void QuicklistMenuItem::AddProperties(GVariantBuilder* builder)
 
=== modified file 'launcher/QuicklistMenuItem.h'
--- launcher/QuicklistMenuItem.h	2012-05-25 20:49:27 +0000
+++ launcher/QuicklistMenuItem.h	2012-08-13 14:28:23 +0000
@@ -1,6 +1,6 @@
 // -*- Mode: C++; indent-tabs-mode: nil; tab-width: 2 -*-
 /*
- * Copyright (C) 2010 Canonical Ltd
+ * Copyright (C) 2010-2012 Canonical Ltd
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
@@ -15,18 +15,18 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * Authored by: Mirco Müller <[e-mail]>
- * Authored by: Jay Taoko <[e-mail]>
+ *              Jay Taoko <[e-mail]>
+ *              Marco Trevisan <[e-mail]>
  */
 
 #ifndef QUICKLISTMENUITEM_H
 #define QUICKLISTMENUITEM_H
 
-#include <libdbusmenu-glib/menuitem.h>
-#include <libdbusmenu-glib/client.h>
-
 #include <Nux/Nux.h>
 #include <Nux/View.h>
 #include <NuxGraphics/CairoGraphics.h>
+#include <libdbusmenu-glib/menuitem.h>
+#include <UnityCore/GLibWrapper.h>
 
 #include <pango/pango.h>
 #include <pango/pangocairo.h>
@@ -36,56 +36,48 @@
 namespace unity
 {
 
-enum QuicklistMenuItemType
+enum class QuicklistMenuItemType
 {
-  MENUITEM_TYPE_UNKNOWN = 0,
-  MENUITEM_TYPE_LABEL,
-  MENUITEM_TYPE_SEPARATOR,
-  MENUITEM_TYPE_CHECK,
-  MENUITEM_TYPE_RADIO,
+  UNKNOWN = 0,
+  LABEL,
+  SEPARATOR,
+  CHECK,
+  RADIO
 };
 
 class QuicklistMenuItem : public nux::View, public debug::Introspectable
 {
   NUX_DECLARE_OBJECT_TYPE(QuicklistMenuItem, nux::View);
 public:
-  QuicklistMenuItem(DbusmenuMenuitem* item,
-                    NUX_FILE_LINE_PROTO);
-
-  QuicklistMenuItem(DbusmenuMenuitem* item,
-                    bool              debug,
-                    NUX_FILE_LINE_PROTO);
-
+  QuicklistMenuItem(QuicklistMenuItemType type, DbusmenuMenuitem* item, NUX_FILE_LINE_PROTO);
   virtual ~QuicklistMenuItem();
 
-  void PreLayoutManagement();
-
-  long PostLayoutManagement(long layoutResult);
-
-  void Draw(nux::GraphicsEngine& gfxContext,
-            bool                 forceDraw);
-
-  void DrawContent(nux::GraphicsEngine& gfxContext,
-                   bool                 forceDraw);
-
-  void PostDraw(nux::GraphicsEngine& gfxContext,
-                bool                 forceDraw);
-
-  QuicklistMenuItemType GetItemType();
-
-  void ItemActivated();
+  QuicklistMenuItemType GetItemType() const;
+  virtual std::string GetLabel() const;
+  virtual bool GetEnabled() const;
+  virtual bool GetActive() const;
+  virtual bool GetVisible() const;
+  virtual bool GetSelectable() const;
+
   void EnableLabelMarkup(bool enabled);
-  bool IsMarkupEnabled();
-
-  sigc::signal<void, QuicklistMenuItem&> sigChanged;
+  bool IsMarkupEnabled() const;
+
+  void Activate() const;
+
+  void Select(bool select = true);
+  bool IsSelected() const;
+
+  nux::Size const& GetTextExtents() const;
+  virtual void UpdateTexture() = 0;
+  unsigned GetCairoSurfaceWidth() const;
+
   sigc::signal<void, QuicklistMenuItem*> sigTextChanged;
   sigc::signal<void, QuicklistMenuItem*> sigColorChanged;
-
-  virtual const gchar* GetLabel();
-  virtual bool GetEnabled();
-  virtual bool GetActive();
-  virtual bool GetVisible();
-  virtual bool GetSelectable();
+  sigc::signal<void, QuicklistMenuItem*> sigMouseEnter;
+  sigc::signal<void, QuicklistMenuItem*> sigMouseLeave;
+  sigc::signal<void, QuicklistMenuItem*, int, int> sigMouseReleased;
+  sigc::signal<void, QuicklistMenuItem*, int, int> sigMouseClick;
+  sigc::signal<void, QuicklistMenuItem*, int, int> sigMouseDrag;
 
 protected:
   // Introspection
@@ -96,25 +88,12 @@
   static const int ITEM_CORNER_RADIUS_ABS = 3;
   static const int ITEM_MARGIN = 4;
 
-  std::string           _text;
-  nux::Color            _textColor;
-  int                   _pre_layout_width;
-  int                   _pre_layout_height;
-  nux::CairoGraphics*   _cairoGraphics;
-
-  nux::BaseTexture*     _normalTexture[2];
-  nux::BaseTexture*     _prelightTexture[2];
-
-  void Initialize(DbusmenuMenuitem* item, bool debug);
   void InitializeText();
-  virtual const gchar* GetDefaultText();
-
-  gchar* GetText();
-  //! Return the size of the text + size of associated radio button or check box
-  void GetTextExtents(int& width, int& height);
-  void GetTextExtents(const gchar* font, int& width, int& height);
-  virtual void UpdateTexture() = 0;
-  virtual int CairoSurfaceWidth() = 0;
+
+  virtual std::string GetDefaultText() const;
+  std::string GetText() const;
+
+  static double Align(double val);
 
   void RecvMouseEnter(int x, int y, unsigned long button_flags, unsigned long key_flags);
   void RecvMouseLeave(int x, int y, unsigned long button_flags, unsigned long key_flags);
@@ -122,27 +101,21 @@
   void RecvMouseClick(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);
 
-  sigc::signal<void, QuicklistMenuItem*> sigMouseEnter;
-  sigc::signal<void, QuicklistMenuItem*> sigMouseLeave;
-  sigc::signal<void, QuicklistMenuItem*, int, int> sigMouseReleased;
-  sigc::signal<void, QuicklistMenuItem*, int, int> sigMouseClick;
-  sigc::signal<void, QuicklistMenuItem*, int, int> sigMouseDrag;
+  void PreLayoutManagement();
+  long PostLayoutManagement(long layoutResult);
+  void Draw(nux::GraphicsEngine& gfxContext, bool forceDraw);
+  void DrawText(nux::CairoGraphics& cairo, int width, int height, nux::Color const& color);
+  void DrawPrelight(nux::CairoGraphics& cairo, int width, int height, nux::Color const& color);
 
-  DbusmenuMenuitem* _menuItem;
+  nux::ObjectPtr<nux::BaseTexture> _normalTexture[2];
+  nux::ObjectPtr<nux::BaseTexture> _prelightTexture[2];
   QuicklistMenuItemType _item_type;
-
-  nux::Color        _color;   //!< Item rendering color factor.
-  bool              _debug;
-
-  bool _prelight;   //!< True when the mouse is over the item.
-
-  void DrawText(nux::CairoGraphics* cairo, int width, int height, nux::Color const& color);
-  void DrawPrelight(nux::CairoGraphics* cairo, int width, int height, nux::Color const& color);
-
-  // Introspection
-  std::string _name;
-
-  friend class QuicklistView;
+  glib::Object<DbusmenuMenuitem> _menu_item;
+  bool _prelight;
+  int _pre_layout_width;
+  int _pre_layout_height;
+  nux::Size _text_extents;
+  std::string _text;
 };
 
 } // NAMESPACE
 
=== modified file 'launcher/QuicklistMenuItemCheckmark.cpp'
--- launcher/QuicklistMenuItemCheckmark.cpp	2012-05-07 22:28:17 +0000
+++ launcher/QuicklistMenuItemCheckmark.cpp	2012-08-13 14:28:23 +0000
@@ -1,6 +1,6 @@
 // -*- Mode: C++; indent-tabs-mode: nil; tab-width: 2 -*-
 /*
- * Copyright (C) 2010 Canonical Ltd
+ * Copyright (C) 2010-2012 Canonical Ltd
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
@@ -15,165 +15,40 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * Authored by: Mirco Müller <[e-mail]>
- * Authored by: Jay Taoko <[e-mail]>
+ *              Jay Taoko <[e-mail]>
+ *              Marco Trevisan <[e-mail]>
  */
 
-#include <gdk/gdk.h>
-#include <gtk/gtk.h>
-
-#include <Nux/Nux.h>
-
 #include "unity-shared/CairoTexture.h"
 #include "QuicklistMenuItemCheckmark.h"
 
 namespace unity
 {
 
-static double
-_align(double val)
-{
-  double fract = val - (int) val;
-
-  if (fract != 0.5f)
-    return (double)((int) val + 0.5f);
-  else
-    return val;
-}
-
-QuicklistMenuItemCheckmark::QuicklistMenuItemCheckmark(DbusmenuMenuitem* item,
-                                                       NUX_FILE_LINE_DECL) :
-  QuicklistMenuItem(item,
-                    NUX_FILE_LINE_PARAM)
-{
-  _item_type  = MENUITEM_TYPE_CHECK;
-  _name = "QuicklistMenuItemCheckmark";
-  InitializeText();
-}
-
-QuicklistMenuItemCheckmark::QuicklistMenuItemCheckmark(DbusmenuMenuitem* item,
-                                                       bool              debug,
-                                                       NUX_FILE_LINE_DECL) :
-  QuicklistMenuItem(item,
-                    debug,
-                    NUX_FILE_LINE_PARAM)
-{
-  _item_type  = MENUITEM_TYPE_CHECK;
-  _name = "QuicklistMenuItemCheckmark";
-  InitializeText();
-}
-
-QuicklistMenuItemCheckmark::~QuicklistMenuItemCheckmark()
-{}
-
-const gchar*
-QuicklistMenuItemCheckmark::GetDefaultText()
+QuicklistMenuItemCheckmark::QuicklistMenuItemCheckmark(DbusmenuMenuitem* item, NUX_FILE_LINE_DECL)
+  : QuicklistMenuItem(QuicklistMenuItemType::CHECK, item, NUX_FILE_LINE_PARAM)
+{
+  InitializeText();
+}
+
+std::string QuicklistMenuItemCheckmark::GetDefaultText() const
 {
   return "Check Mark";
 }
 
-void
-QuicklistMenuItemCheckmark::PreLayoutManagement()
-{
-  _pre_layout_width = GetBaseWidth();
-  _pre_layout_height = GetBaseHeight();
-
-  if (_normalTexture[0] == 0)
-  {
-    UpdateTexture();
-  }
-
-  QuicklistMenuItem::PreLayoutManagement();
-}
-
-long
-QuicklistMenuItemCheckmark::PostLayoutManagement(long layoutResult)
-{
-  int w = GetBaseWidth();
-  int h = GetBaseHeight();
-
-  long result = 0;
-
-  if (_pre_layout_width < w)
-    result |= nux::eLargerWidth;
-  else if (_pre_layout_width > w)
-    result |= nux::eSmallerWidth;
-  else
-    result |= nux::eCompliantWidth;
-
-  if (_pre_layout_height < h)
-    result |= nux::eLargerHeight;
-  else if (_pre_layout_height > h)
-    result |= nux::eSmallerHeight;
-  else
-    result |= nux::eCompliantHeight;
-
-  return result;
-}
-
-void
-QuicklistMenuItemCheckmark::Draw(nux::GraphicsEngine& gfxContext, bool forceDraw)
-{
-  nux::ObjectPtr<nux::IOpenGLBaseTexture> texture;
-
-  // Check if the texture have been computed. If they haven't, exit the function.
-  if (!_normalTexture[0] || !_prelightTexture[0])
-    return;
-
-  nux::Geometry base = GetGeometry();
-
-  gfxContext.PushClippingRectangle(base);
-
-  nux::TexCoordXForm texxform;
-  texxform.SetWrap(nux::TEXWRAP_REPEAT, nux::TEXWRAP_REPEAT);
-  texxform.SetTexCoordType(nux::TexCoordXForm::OFFSET_COORD);
-
-  gfxContext.GetRenderStates().SetBlend(true);
-  gfxContext.GetRenderStates().SetPremultipliedBlend(nux::SRC_OVER);
-
-  unsigned int texture_idx = GetActive() ? 1 : 0;
-
-  if (!_prelight || !GetEnabled())
-  {
-    texture = _normalTexture[texture_idx]->GetDeviceTexture();
-  }
-  else
-  {
-    texture = _prelightTexture[texture_idx]->GetDeviceTexture();
-  }
-
-  _color = GetEnabled() ? nux::color::White : nux::color::White * 0.35;
-
-  gfxContext.QRP_1Tex(base.x,
-                      base.y,
-                      base.width,
-                      base.height,
-                      texture,
-                      texxform,
-                      _color);
-
-  gfxContext.GetRenderStates().SetBlend(false);
-
-  gfxContext.PopClippingRectangle();
-}
-
-void QuicklistMenuItemCheckmark::DrawContent(nux::GraphicsEngine& gfxContext,
-                                             bool                 forceDraw)
-{
-}
-
-void QuicklistMenuItemCheckmark::PostDraw(nux::GraphicsEngine& gfxContext,
-                                          bool                 forceDraw)
-{
-}
-
-void
-QuicklistMenuItemCheckmark::UpdateTexture()
-{
-  int        width       = GetBaseWidth();
-  int        height      = GetBaseHeight();
-
-  _cairoGraphics = new nux::CairoGraphics(CAIRO_FORMAT_ARGB32, width, height);
-  cairo_t* cr = _cairoGraphics->GetContext();
+std::string QuicklistMenuItemCheckmark::GetName() const
+{
+  return "QuicklistMenuItemCheckmark";
+}
+
+void QuicklistMenuItemCheckmark::UpdateTexture()
+{
+  int width = GetBaseWidth();
+  int height = GetBaseHeight();
+
+  nux::CairoGraphics cairoGraphics(CAIRO_FORMAT_ARGB32, width, height);
+  std::shared_ptr<cairo_t> cairo_context(cairoGraphics.GetContext(), cairo_destroy);
+  cairo_t* cr = cairo_context.get();
 
   // draw normal, unchecked version
   cairo_set_operator(cr, CAIRO_OPERATOR_CLEAR);
@@ -184,11 +59,9 @@
   cairo_set_source_rgba(cr, 1.0f, 1.0f, 1.0f, 1.0f);
   cairo_set_line_width(cr, 1.0f);
 
-  DrawText(_cairoGraphics, width, height, nux::color::White);
+  DrawText(cairoGraphics, width, height, nux::color::White);
 
-  if (_normalTexture[0])
-    _normalTexture[0]->UnReference();
-  _normalTexture[0] = texture_from_cairo_graphics(*_cairoGraphics);
+  _normalTexture[0].Adopt(texture_from_cairo_graphics(cairoGraphics));
 
   // draw normal, checked version
   cairo_set_operator(cr, CAIRO_OPERATOR_CLEAR);
@@ -200,9 +73,8 @@
   cairo_set_line_width(cr, 1.0f);
 
   cairo_save(cr);
-  cairo_translate(cr,
-                  _align((ITEM_INDENT_ABS - 16.0f + ITEM_MARGIN) / 2.0f),
-                  _align(((double) height - 16.0f) / 2.0f));
+  cairo_translate(cr, Align((ITEM_INDENT_ABS - 16.0f + ITEM_MARGIN) / 2.0f),
+                      Align((static_cast<double>(height) - 16.0f) / 2.0f));
 
   cairo_set_source_rgba(cr, 1.0f, 1.0f, 1.0f, 1.0f);
 
@@ -221,37 +93,30 @@
 
   cairo_restore(cr);
 
-  DrawText(_cairoGraphics, width, height, nux::color::White);
-
-  if (_normalTexture[1])
-    _normalTexture[1]->UnReference();
-
-  _normalTexture[1] = texture_from_cairo_graphics(*_cairoGraphics);
+  DrawText(cairoGraphics, width, height, nux::color::White);
+
+  _normalTexture[1].Adopt(texture_from_cairo_graphics(cairoGraphics));
 
   // draw active/prelight, unchecked version
   cairo_set_operator(cr, CAIRO_OPERATOR_CLEAR);
   cairo_paint(cr);
 
-  DrawPrelight(_cairoGraphics, width, height, nux::color::White);
-  DrawText(_cairoGraphics, width, height, nux::color::White * 0.0f);
-
-  if (_prelightTexture[0])
-    _prelightTexture[0]->UnReference();
-
-  _prelightTexture[0] = texture_from_cairo_graphics(*_cairoGraphics);
+  DrawPrelight(cairoGraphics, width, height, nux::color::White);
+  DrawText(cairoGraphics, width, height, nux::color::White * 0.0f);
+
+  _prelightTexture[0].Adopt(texture_from_cairo_graphics(cairoGraphics));
 
   // draw active/prelight, checked version
   cairo_set_operator(cr, CAIRO_OPERATOR_CLEAR);
   cairo_paint(cr);
 
-  DrawPrelight(_cairoGraphics, width, height, nux::color::White);
+  DrawPrelight(cairoGraphics, width, height, nux::color::White);
 
   cairo_set_source_rgba(cr, 0.0f, 0.0f, 0.0f, 0.0f);
 
   cairo_save(cr);
-  cairo_translate(cr,
-                  _align((ITEM_INDENT_ABS - 16.0f + ITEM_MARGIN) / 2.0f),
-                  _align(((double) height - 16.0f) / 2.0f));
+  cairo_translate(cr, Align((ITEM_INDENT_ABS - 16.0f + ITEM_MARGIN) / 2.0f),
+                      Align((static_cast<double>(height) - 16.0f) / 2.0f));
 
   cairo_translate(cr, 3.0f, 1.0f);
   cairo_move_to(cr, 0.0f, 6.0f);
@@ -268,24 +133,9 @@
 
   cairo_restore(cr);
 
-  DrawText(_cairoGraphics, width, height, nux::color::White * 0.0f);
-
-  if (_prelightTexture[1])
-    _prelightTexture[1]->UnReference();
-
-  _prelightTexture[1] = texture_from_cairo_graphics(*_cairoGraphics);
-
-  // finally clean up
-  cairo_destroy(cr);
-  delete _cairoGraphics;
-}
-
-int QuicklistMenuItemCheckmark::CairoSurfaceWidth()
-{
-  if (_normalTexture[0])
-    return _normalTexture[0]->GetWidth();
-
-  return 0;
+  DrawText(cairoGraphics, width, height, nux::color::White * 0.0f);
+
+  _prelightTexture[1].Adopt(texture_from_cairo_graphics(cairoGraphics));
 }
 
 }
 
=== modified file 'launcher/QuicklistMenuItemCheckmark.h'
--- launcher/QuicklistMenuItemCheckmark.h	2012-05-25 20:49:27 +0000
+++ launcher/QuicklistMenuItemCheckmark.h	2012-08-13 14:28:23 +0000
@@ -15,51 +15,28 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * Authored by: Mirco Müller <[e-mail]>
- * Authored by: Jay Taoko <[e-mail]>
+ *              Jay Taoko <[e-mail]>
+ *              Marco Trevisan <[e-mail]>
  */
 
 #ifndef QUICKLISTMENUITEMCHECKMARK_H
 #define QUICKLISTMENUITEMCHECKMARK_H
 
-#include <Nux/Nux.h>
-#include <Nux/View.h>
-#include <NuxGraphics/CairoGraphics.h>
-
 #include "QuicklistMenuItem.h"
 
-#include <X11/Xlib.h>
-
 namespace unity
 {
 
 class QuicklistMenuItemCheckmark : public QuicklistMenuItem
 {
 public:
-  QuicklistMenuItemCheckmark(DbusmenuMenuitem* item,
-                             NUX_FILE_LINE_PROTO);
-
-  QuicklistMenuItemCheckmark(DbusmenuMenuitem* item,
-                             bool              debug,
-                             NUX_FILE_LINE_PROTO);
-
-  ~QuicklistMenuItemCheckmark();
+  QuicklistMenuItemCheckmark(DbusmenuMenuitem* item, NUX_FILE_LINE_PROTO);
 
 protected:
-
-  void PreLayoutManagement();
-
-  long PostLayoutManagement(long layoutResult);
-
-  void Draw(nux::GraphicsEngine& gfxContext, bool forceDraw);
-
-  void DrawContent(nux::GraphicsEngine& gfxContext, bool forceDraw);
-
-  void PostDraw(nux::GraphicsEngine& gfxContext, bool forceDraw);
-
-  virtual const gchar* GetDefaultText();
-
+  std::string GetName() const;
+
+  virtual std::string GetDefaultText() const;
   virtual void UpdateTexture();
-  virtual int CairoSurfaceWidth();
 };
 
 } // NAMESPACE
 
=== modified file 'launcher/QuicklistMenuItemLabel.cpp'
--- launcher/QuicklistMenuItemLabel.cpp	2012-05-07 22:28:17 +0000
+++ launcher/QuicklistMenuItemLabel.cpp	2012-08-13 14:28:23 +0000
@@ -1,6 +1,6 @@
 // -*- Mode: C++; indent-tabs-mode: nil; tab-width: 2 -*-
 /*
- * Copyright (C) 2010 Canonical Ltd
+ * Copyright (C) 2010-2012 Canonical Ltd
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
@@ -15,197 +15,57 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * Authored by: Mirco Müller <[e-mail]>
- * Authored by: Jay Taoko <[e-mail]>
+ *              Jay Taoko <[e-mail]>
+ *              Marco Trevisan <[e-mail]>
  */
 
-#include <gdk/gdk.h>
-#include <gtk/gtk.h>
-
-#include <Nux/Nux.h>
-
 #include "unity-shared/CairoTexture.h"
 #include "QuicklistMenuItemLabel.h"
 
 namespace unity
 {
 
-QuicklistMenuItemLabel::QuicklistMenuItemLabel(DbusmenuMenuitem* item,
-                                               NUX_FILE_LINE_DECL) :
-  QuicklistMenuItem(item,
-                    NUX_FILE_LINE_PARAM)
-{
-  _item_type  = MENUITEM_TYPE_LABEL;
-  _name = "QuicklistMenuItemLabel";
-  InitializeText();
-}
-
-QuicklistMenuItemLabel::QuicklistMenuItemLabel(DbusmenuMenuitem* item,
-                                               bool              debug,
-                                               NUX_FILE_LINE_DECL) :
-  QuicklistMenuItem(item,
-                    debug,
-                    NUX_FILE_LINE_PARAM)
-{
-  _item_type  = MENUITEM_TYPE_LABEL;
-  _name = "QuicklistMenuItemLabel";
-  InitializeText();
-}
-
-QuicklistMenuItemLabel::~QuicklistMenuItemLabel()
-{}
-
-const gchar*
-QuicklistMenuItemLabel::GetDefaultText()
+QuicklistMenuItemLabel::QuicklistMenuItemLabel(DbusmenuMenuitem* item, NUX_FILE_LINE_DECL)
+  : QuicklistMenuItem(QuicklistMenuItemType::LABEL, item, NUX_FILE_LINE_PARAM)
+{
+  InitializeText();
+}
+
+std::string QuicklistMenuItemLabel::GetDefaultText() const
 {
   return "Label";
 }
 
-void
-QuicklistMenuItemLabel::PreLayoutManagement()
-{
-  _pre_layout_width = GetBaseWidth();
-  _pre_layout_height = GetBaseHeight();
-
-  if (_normalTexture[0] == 0)
-  {
-    UpdateTexture();
-  }
-
-  QuicklistMenuItem::PreLayoutManagement();
-}
-
-long
-QuicklistMenuItemLabel::PostLayoutManagement(long layoutResult)
-{
-  int w = GetBaseWidth();
-  int h = GetBaseHeight();
-
-  long result = 0;
-
-  if (_pre_layout_width < w)
-    result |= nux::eLargerWidth;
-  else if (_pre_layout_width > w)
-    result |= nux::eSmallerWidth;
-  else
-    result |= nux::eCompliantWidth;
-
-  if (_pre_layout_height < h)
-    result |= nux::eLargerHeight;
-  else if (_pre_layout_height > h)
-    result |= nux::eSmallerHeight;
-  else
-    result |= nux::eCompliantHeight;
-
-  return result;
-}
-
-void
-QuicklistMenuItemLabel::Draw(nux::GraphicsEngine& gfxContext,
-                             bool                 forceDraw)
-{
-  // Check if the texture have been computed. If they haven't, exit the function.
-  if (_normalTexture[0] == NULL)
-    return;
-
-  nux::ObjectPtr<nux::IOpenGLBaseTexture> texture;
-
-  nux::Geometry base = GetGeometry();
-
-  gfxContext.PushClippingRectangle(base);
-
-  nux::TexCoordXForm texxform;
-  texxform.SetWrap(nux::TEXWRAP_REPEAT, nux::TEXWRAP_REPEAT);
-  texxform.SetTexCoordType(nux::TexCoordXForm::OFFSET_COORD);
-
-  gfxContext.GetRenderStates().SetBlend(true);
-  gfxContext.GetRenderStates().SetPremultipliedBlend(nux::SRC_OVER);
-
-  if (GetEnabled())
-  {
-    if (_prelight)
-    {
-      texture = _prelightTexture[0]->GetDeviceTexture();
-    }
-    else
-    {
-      texture = _normalTexture[0]->GetDeviceTexture();
-    }
-    _color = nux::color::White;
-  }
-  else
-  {
-    texture = _normalTexture[0]->GetDeviceTexture();
-    _color = nux::color::White * 0.35;
-  }
-
-  gfxContext.QRP_1Tex(base.x,
-                      base.y,
-                      base.width,
-                      base.height,
-                      texture,
-                      texxform,
-                      _color);
-
-  gfxContext.GetRenderStates().SetBlend(false);
-
-  gfxContext.PopClippingRectangle();
-}
-
-void
-QuicklistMenuItemLabel::DrawContent(nux::GraphicsEngine& gfxContext,
-                                    bool                 forceDraw)
-{
-}
-
-void
-QuicklistMenuItemLabel::PostDraw(nux::GraphicsEngine& gfxContext,
-                                 bool                 forceDraw)
-{
-}
-
-void
-QuicklistMenuItemLabel::UpdateTexture()
-{
-  int        width       = GetBaseWidth();
-  int        height      = GetBaseHeight();
-
-  _cairoGraphics = new nux::CairoGraphics(CAIRO_FORMAT_ARGB32, width, height);
-  cairo_t* cr = _cairoGraphics->GetContext();
+std::string QuicklistMenuItemLabel::GetName() const
+{
+  return "QuicklistMenuItemLabel";
+}
+
+void QuicklistMenuItemLabel::UpdateTexture()
+{
+  int width = GetBaseWidth();
+  int height = GetBaseHeight();
+
+  nux::CairoGraphics cairoGraphics(CAIRO_FORMAT_ARGB32, width, height);
+  std::shared_ptr<cairo_t> cairo_context(cairoGraphics.GetContext(), cairo_destroy);
+  cairo_t* cr = cairo_context.get();
 
   // draw normal, unchecked version
   cairo_set_operator(cr, CAIRO_OPERATOR_CLEAR);
   cairo_paint(cr);
 
-  DrawText(_cairoGraphics, width, height, nux::color::White);
-
-  if (_normalTexture[0])
-    _normalTexture[0]->UnReference();
-
-  _normalTexture[0] = texture_from_cairo_graphics(*_cairoGraphics);
+  DrawText(cairoGraphics, width, height, nux::color::White);
+
+  _normalTexture[0].Adopt(texture_from_cairo_graphics(cairoGraphics));
 
   // draw active/prelight, unchecked version
   cairo_set_operator(cr, CAIRO_OPERATOR_CLEAR);
   cairo_paint(cr);
 
-  DrawPrelight(_cairoGraphics, width, height, nux::color::White);
-  DrawText(_cairoGraphics, width, height, nux::color::White * 0.0f);
-
-  if (_prelightTexture[0])
-    _prelightTexture[0]->UnReference();
-
-  _prelightTexture[0] = texture_from_cairo_graphics(*_cairoGraphics);
-
-  // finally clean up
-  cairo_destroy(cr);
-  delete _cairoGraphics;
-}
-
-int QuicklistMenuItemLabel::CairoSurfaceWidth()
-{
-  if (_normalTexture[0])
-    return _normalTexture[0]->GetWidth();
-
-  return 0;
+  DrawPrelight(cairoGraphics, width, height, nux::color::White);
+  DrawText(cairoGraphics, width, height, nux::color::White * 0.0f);
+
+  _prelightTexture[0].Adopt(texture_from_cairo_graphics(cairoGraphics));
 }
 
 } // NAMESPACE
 
=== modified file 'launcher/QuicklistMenuItemLabel.h'
--- launcher/QuicklistMenuItemLabel.h	2012-05-25 20:49:27 +0000
+++ launcher/QuicklistMenuItemLabel.h	2012-08-13 14:28:23 +0000
@@ -15,51 +15,28 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * Authored by: Mirco Müller <[e-mail]>
- * Authored by: Jay Taoko <[e-mail]>
+ *              Jay Taoko <[e-mail]>
+ *              Marco Trevisan <[e-mail]>
  */
 
 #ifndef QUICKLISTMENUITEMLABEL_H
 #define QUICKLISTMENUITEMLABEL_H
 
-#include <Nux/Nux.h>
-#include <Nux/View.h>
-#include <NuxGraphics/CairoGraphics.h>
-
 #include "QuicklistMenuItem.h"
 
-#include <X11/Xlib.h>
-
 namespace unity
 {
 
 class QuicklistMenuItemLabel : public QuicklistMenuItem
 {
 public:
-  QuicklistMenuItemLabel(DbusmenuMenuitem* item,
-                         NUX_FILE_LINE_PROTO);
-
-  QuicklistMenuItemLabel(DbusmenuMenuitem* item,
-                         bool              debug,
-                         NUX_FILE_LINE_PROTO);
-
-  ~QuicklistMenuItemLabel();
+  QuicklistMenuItemLabel(DbusmenuMenuitem* item, NUX_FILE_LINE_PROTO);
 
 protected:
-
-  void PreLayoutManagement();
-
-  long PostLayoutManagement(long layoutResult);
-
-  void Draw(nux::GraphicsEngine& gfxContext, bool forceDraw);
-
-  void DrawContent(nux::GraphicsEngine& gfxContext, bool forceDraw);
-
-  void PostDraw(nux::GraphicsEngine& gfxContext, bool forceDraw);
-
-  virtual const gchar* GetDefaultText();
-
+  std::string GetName() const;
+
+  virtual std::string GetDefaultText() const;
   virtual void UpdateTexture();
-  virtual int CairoSurfaceWidth();
 };
 
 } // NAMESPACE
 
=== modified file 'launcher/QuicklistMenuItemRadio.cpp'
--- launcher/QuicklistMenuItemRadio.cpp	2012-05-07 22:28:17 +0000
+++ launcher/QuicklistMenuItemRadio.cpp	2012-08-13 14:28:23 +0000
@@ -1,6 +1,6 @@
 // -*- Mode: C++; indent-tabs-mode: nil; tab-width: 2 -*-
 /*
- * Copyright (C) 2010 Canonical Ltd
+ * Copyright (C) 2010-2012 Canonical Ltd
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
@@ -15,177 +15,47 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * Authored by: Mirco Müller <[e-mail]>
+ *              Marco Trevisan <[e-mail]>
  */
 
-#include <gdk/gdk.h>
-#include <gtk/gtk.h>
-
-#include <Nux/Nux.h>
-
 #include "unity-shared/CairoTexture.h"
 #include "QuicklistMenuItemRadio.h"
 
 namespace unity
 {
 
-static double
-_align(double val)
-{
-  double fract = val - (int) val;
-
-  if (fract != 0.5f)
-    return (double)((int) val + 0.5f);
-  else
-    return val;
-}
-
-QuicklistMenuItemRadio::QuicklistMenuItemRadio(DbusmenuMenuitem* item,
-                                               NUX_FILE_LINE_DECL) :
-  QuicklistMenuItem(item,
-                    NUX_FILE_LINE_PARAM)
-{
-  _item_type  = MENUITEM_TYPE_RADIO;
-  _name = "QuicklistMenuItemRadio";
-  InitializeText();
-}
-
-QuicklistMenuItemRadio::QuicklistMenuItemRadio(DbusmenuMenuitem* item,
-                                               bool              debug,
-                                               NUX_FILE_LINE_DECL) :
-  QuicklistMenuItem(item,
-                    debug,
-                    NUX_FILE_LINE_PARAM)
-{
-  _item_type  = MENUITEM_TYPE_RADIO;
-  _name = "QuicklistMenuItemRadio";
-  InitializeText();
-}
-
-QuicklistMenuItemRadio::~QuicklistMenuItemRadio()
-{}
-
-const gchar*
-QuicklistMenuItemRadio::GetDefaultText()
+QuicklistMenuItemRadio::QuicklistMenuItemRadio(DbusmenuMenuitem* item, NUX_FILE_LINE_DECL)
+  : QuicklistMenuItem(QuicklistMenuItemType::RADIO, item, NUX_FILE_LINE_PARAM)
+{
+  InitializeText();
+}
+
+std::string QuicklistMenuItemRadio::GetDefaultText() const
 {
   return "Radio Button";
 }
 
-void
-QuicklistMenuItemRadio::PreLayoutManagement()
-{
-  _pre_layout_width = GetBaseWidth();
-  _pre_layout_height = GetBaseHeight();
-
-  if (_normalTexture[0] == 0)
-  {
-    UpdateTexture();
-  }
-
-  QuicklistMenuItem::PreLayoutManagement();
-}
-
-long
-QuicklistMenuItemRadio::PostLayoutManagement(long layoutResult)
-{
-  int w = GetBaseWidth();
-  int h = GetBaseHeight();
-
-  long result = 0;
-
-  if (_pre_layout_width < w)
-    result |= nux::eLargerWidth;
-  else if (_pre_layout_width > w)
-    result |= nux::eSmallerWidth;
-  else
-    result |= nux::eCompliantWidth;
-
-  if (_pre_layout_height < h)
-    result |= nux::eLargerHeight;
-  else if (_pre_layout_height > h)
-    result |= nux::eSmallerHeight;
-  else
-    result |= nux::eCompliantHeight;
-
-  return result;
-}
-
-void
-QuicklistMenuItemRadio::Draw(nux::GraphicsEngine& gfxContext, bool forceDraw)
-{
-  nux::ObjectPtr<nux::IOpenGLBaseTexture> texture;
-
-  // Check if the texture have been computed. If they haven't, exit the function.
-  if (!_normalTexture[0] || !_prelightTexture[0])
-    return;
-
-  nux::Geometry base = GetGeometry();
-
-  gfxContext.PushClippingRectangle(base);
-
-  nux::TexCoordXForm texxform;
-  texxform.SetWrap(nux::TEXWRAP_REPEAT, nux::TEXWRAP_REPEAT);
-  texxform.SetTexCoordType(nux::TexCoordXForm::OFFSET_COORD);
-
-  gfxContext.GetRenderStates().SetBlend(true);
-  gfxContext.GetRenderStates().SetPremultipliedBlend(nux::SRC_OVER);
-
-  unsigned int texture_idx = GetActive() ? 1 : 0;
-
-  if (!_prelight || !GetEnabled())
-  {
-    texture = _normalTexture[texture_idx]->GetDeviceTexture();
-  }
-  else
-  {
-    texture = _prelightTexture[texture_idx]->GetDeviceTexture();
-  }
-
-  _color = GetEnabled() ? nux::color::White : nux::color::White * 0.35;
-
-  gfxContext.QRP_1Tex(base.x,
-                      base.y,
-                      base.width,
-                      base.height,
-                      texture,
-                      texxform,
-                      _color);
-
-  gfxContext.GetRenderStates().SetBlend(false);
-
-  gfxContext.PopClippingRectangle();
-}
-
-void
-QuicklistMenuItemRadio::DrawContent(nux::GraphicsEngine& gfxContext,
-                                    bool                 forceDraw)
-{
-}
-
-void
-QuicklistMenuItemRadio::PostDraw(nux::GraphicsEngine& gfxContext,
-                                 bool                 forceDraw)
-{
-}
-
-void
-QuicklistMenuItemRadio::UpdateTexture()
-{
-  int        width       = GetBaseWidth();
-  int        height      = GetBaseHeight();
-
-  _cairoGraphics = new nux::CairoGraphics(CAIRO_FORMAT_ARGB32, width, height);
-  cairo_t* cr = _cairoGraphics->GetContext();
+std::string QuicklistMenuItemRadio::GetName() const
+{
+  return "QuicklistMenuItemRadio";
+}
+
+void QuicklistMenuItemRadio::UpdateTexture()
+{
+  int width = GetBaseWidth();
+  int height = GetBaseHeight();
+
+  nux::CairoGraphics cairoGraphics(CAIRO_FORMAT_ARGB32, width, height);
+  std::shared_ptr<cairo_t> cairo_context(cairoGraphics.GetContext(), cairo_destroy);
+  cairo_t* cr = cairo_context.get();
 
   // draw normal, disabled version
   cairo_set_operator(cr, CAIRO_OPERATOR_CLEAR);
   cairo_paint(cr);
 
-  DrawText(_cairoGraphics, width, height, nux::color::White);
-
-  if (_normalTexture[0])
-    _normalTexture[0]->UnReference();
-
-  _normalTexture[0] = texture_from_cairo_graphics(*_cairoGraphics);
+  DrawText(cairoGraphics, width, height, nux::color::White);
+
+  _normalTexture[0].Adopt(texture_from_cairo_graphics(cairoGraphics));
 
   // draw normal, enabled version
   cairo_set_operator(cr, CAIRO_OPERATOR_CLEAR);
@@ -196,62 +66,41 @@
   cairo_set_source_rgba(cr, 1.0f, 1.0f, 1.0f, 1.0f);
   cairo_set_line_width(cr, 1.0f);
 
-  double x      = _align((ITEM_INDENT_ABS + ITEM_MARGIN) / 2.0f);
-  double y      = _align((double) height / 2.0f);
+  double x = Align((ITEM_INDENT_ABS + ITEM_MARGIN) / 2.0f);
+  double y = Align(static_cast<double>(height) / 2.0f);
   double radius = 3.5f;
 
   cairo_set_source_rgba(cr, 1.0f, 1.0f, 1.0f, 1.0f);
   cairo_arc(cr, x, y, radius, 0.0f * (G_PI / 180.0f), 360.0f * (G_PI / 180.0f));
   cairo_fill(cr);
 
-  DrawText(_cairoGraphics, width, height, nux::color::White);
-
-  if (_normalTexture[1])
-    _normalTexture[1]->UnReference();
-
-  _normalTexture[1] = texture_from_cairo_graphics(*_cairoGraphics);
-
-  // draw active/prelight, unchecked version
-  cairo_set_operator(cr, CAIRO_OPERATOR_CLEAR);
-  cairo_paint(cr);
-
-  DrawPrelight(_cairoGraphics, width, height, nux::color::White);
-  DrawText(_cairoGraphics, width, height, nux::color::White * 0.0f);
-
-  if (_prelightTexture[0])
-    _prelightTexture[0]->UnReference();
-
-  _prelightTexture[0] = texture_from_cairo_graphics(*_cairoGraphics);
-
-  // draw active/prelight, unchecked version
-  cairo_set_operator(cr, CAIRO_OPERATOR_CLEAR);
-  cairo_paint(cr);
-
-  DrawPrelight(_cairoGraphics, width, height, nux::color::White);
+  DrawText(cairoGraphics, width, height, nux::color::White);
+
+  _normalTexture[1].Adopt(texture_from_cairo_graphics(cairoGraphics));
+
+  // draw active/prelight, unchecked version
+  cairo_set_operator(cr, CAIRO_OPERATOR_CLEAR);
+  cairo_paint(cr);
+
+  DrawPrelight(cairoGraphics, width, height, nux::color::White);
+  DrawText(cairoGraphics, width, height, nux::color::White * 0.0f);
+
+  _prelightTexture[0].Adopt(texture_from_cairo_graphics(cairoGraphics));
+
+  // draw active/prelight, unchecked version
+  cairo_set_operator(cr, CAIRO_OPERATOR_CLEAR);
+  cairo_paint(cr);
+
+  DrawPrelight(cairoGraphics, width, height, nux::color::White);
 
   cairo_set_source_rgba(cr, 0.0f, 0.0f, 0.0f, 0.0f);
 
   cairo_arc(cr, x, y, radius, 0.0f * (G_PI / 180.0f), 360.0f * (G_PI / 180.0f));
   cairo_fill(cr);
 
-  DrawText(_cairoGraphics, width, height, nux::color::White * 0.0f);
-
-  if (_prelightTexture[1])
-    _prelightTexture[1]->UnReference();
-
-  _prelightTexture[1] = texture_from_cairo_graphics(*_cairoGraphics);
-
-  // finally clean up
-  cairo_destroy(cr);
-  delete _cairoGraphics;
-}
-
-int QuicklistMenuItemRadio::CairoSurfaceWidth()
-{
-  if (_normalTexture[0])
-    return _normalTexture[0]->GetWidth();
-
-  return 0;
+  DrawText(cairoGraphics, width, height, nux::color::White * 0.0f);
+
+  _prelightTexture[1].Adopt(texture_from_cairo_graphics(cairoGraphics));
 }
 
 } // NAMESPACE
 
=== modified file 'launcher/QuicklistMenuItemRadio.h'
--- launcher/QuicklistMenuItemRadio.h	2012-05-25 20:49:27 +0000
+++ launcher/QuicklistMenuItemRadio.h	2012-08-13 14:28:23 +0000
@@ -15,52 +15,27 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * Authored by: Mirco Müller <[e-mail]>
+ *              Marco Trevisan <[e-mail]>
  */
 
 #ifndef QUICKLISTMENUITEMRADIO_H
 #define QUICKLISTMENUITEMRADIO_H
 
-#include <Nux/Nux.h>
-#include <Nux/View.h>
-#include <NuxGraphics/CairoGraphics.h>
-
 #include "QuicklistMenuItem.h"
 
-#include <X11/Xlib.h>
-
 namespace unity
 {
 
 class QuicklistMenuItemRadio : public QuicklistMenuItem
 {
 public:
-  QuicklistMenuItemRadio(DbusmenuMenuitem* item,
-                         NUX_FILE_LINE_PROTO);
-
-  QuicklistMenuItemRadio(DbusmenuMenuitem* item,
-                         bool              debug,
-                         NUX_FILE_LINE_PROTO);
-
-  ~QuicklistMenuItemRadio();
+  QuicklistMenuItemRadio(DbusmenuMenuitem* item, NUX_FILE_LINE_PROTO);
 
 protected:
-  void PreLayoutManagement();
-
-  long PostLayoutManagement(long layoutResult);
-
-  void Draw(nux::GraphicsEngine& gfxContext,
-            bool                 forceDraw);
-
-  void DrawContent(nux::GraphicsEngine& gfxContext,
-                   bool                 forceDraw);
-
-  void PostDraw(nux::GraphicsEngine& gfxContext,
-                bool                 forceDraw);
-
-  virtual const gchar* GetDefaultText();
-
+  std::string GetName() const;
+
+  virtual std::string GetDefaultText() const;
   virtual void UpdateTexture();
-  virtual int CairoSurfaceWidth();
 };
 
 } //NAMESPACE
 
=== modified file 'launcher/QuicklistMenuItemSeparator.cpp'
--- launcher/QuicklistMenuItemSeparator.cpp	2012-05-07 22:28:17 +0000
+++ launcher/QuicklistMenuItemSeparator.cpp	2012-08-13 14:28:23 +0000
@@ -1,6 +1,6 @@
 // -*- Mode: C++; indent-tabs-mode: nil; tab-width: 2 -*-
 /*
- * Copyright (C) 2010 Canonical Ltd
+ * Copyright (C) 2010-2012 Canonical Ltd
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
@@ -15,104 +15,41 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * Authored by: Mirco Müller <[e-mail]>
+ *              Marco Trevisan <[e-mail]>
  */
 
-#include <Nux/Nux.h>
-
 #include "unity-shared/CairoTexture.h"
 #include "QuicklistMenuItemSeparator.h"
 
 namespace unity
 {
 
-QuicklistMenuItemSeparator::QuicklistMenuItemSeparator(DbusmenuMenuitem* item,
-                                                       NUX_FILE_LINE_DECL) :
-  QuicklistMenuItem(item,
-                    NUX_FILE_LINE_PARAM)
-{
-  _name = "QuicklistMenuItemSeparator";
-  SetMinimumHeight(7);
-  SetBaseSize(64, 7);
-
-  _color      = nux::Color(1.0f, 1.0f, 1.0f, 0.5f);
-  _premultiplied_color = nux::Color(0.5f, 0.5f, 0.5f, 0.5f);
-  _item_type  = MENUITEM_TYPE_SEPARATOR;
-}
-
-QuicklistMenuItemSeparator::QuicklistMenuItemSeparator(DbusmenuMenuitem* item,
-                                                       bool              debug,
-                                                       NUX_FILE_LINE_DECL) :
-  QuicklistMenuItem(item,
-                    debug,
-                    NUX_FILE_LINE_PARAM)
-{
-  _name = "QuicklistMenuItemSeparator";
-  SetMinimumHeight(7);
-  SetBaseSize(64, 7);
-  //_normalTexture = NULL;
-  _color      = nux::Color(1.0f, 1.0f, 1.0f, 0.5f);
-  _premultiplied_color = nux::Color(0.5f, 0.5f, 0.5f, 0.5f);
-  _item_type  = MENUITEM_TYPE_SEPARATOR;
-}
-
-QuicklistMenuItemSeparator::~QuicklistMenuItemSeparator()
-{
-}
-
-bool
-QuicklistMenuItemSeparator::GetSelectable()
+QuicklistMenuItemSeparator::QuicklistMenuItemSeparator(DbusmenuMenuitem* item, NUX_FILE_LINE_DECL)
+  : QuicklistMenuItem(QuicklistMenuItemType::SEPARATOR, item, NUX_FILE_LINE_PARAM)
+  , _color(1.0f, 1.0f, 1.0f, 0.5f)
+  , _premultiplied_color(0.5f, 0.5f, 0.5f, 0.5f)
+{
+  SetMinimumHeight(7);
+  SetBaseSize(64, 7);
+}
+
+std::string QuicklistMenuItemSeparator::GetName() const
+{
+  return "QuicklistMenuItemSeparator";
+}
+
+bool QuicklistMenuItemSeparator::GetSelectable()
 {
   return false;
 }
 
-void
-QuicklistMenuItemSeparator::PreLayoutManagement()
-{
-  _pre_layout_width = GetBaseWidth();
-  _pre_layout_height = GetBaseHeight();
-
-  if ((_normalTexture[0] == 0))
-  {
-    UpdateTexture();
-  }
-
-  QuicklistMenuItem::PreLayoutManagement();
-}
-
-long
-QuicklistMenuItemSeparator::PostLayoutManagement(long layoutResult)
-{
-  int w = GetBaseWidth();
-  int h = GetBaseHeight();
-
-  long result = 0;
-
-  if (_pre_layout_width < w)
-    result |= nux::eLargerWidth;
-  else if (_pre_layout_width > w)
-    result |= nux::eSmallerWidth;
-  else
-    result |= nux::eCompliantWidth;
-
-  if (_pre_layout_height < h)
-    result |= nux::eLargerHeight;
-  else if (_pre_layout_height > h)
-    result |= nux::eSmallerHeight;
-  else
-    result |= nux::eCompliantHeight;
-
-  return result;
-}
-
-void
-QuicklistMenuItemSeparator::Draw(nux::GraphicsEngine& gfxContext,
-                                 bool                 forceDraw)
+void QuicklistMenuItemSeparator::Draw(nux::GraphicsEngine& gfxContext, bool forceDraw)
 {
   // Check if the texture have been computed. If they haven't, exit the function.
-  if (_normalTexture[0] == 0)
+  if (!_normalTexture[0])
     return;
 
-  nux::Geometry base = GetGeometry();
+  nux::Geometry const& base = GetGeometry();
 
   gfxContext.PushClippingRectangle(base);
 
@@ -123,39 +60,21 @@
   gfxContext.GetRenderStates().SetBlend(true);
   gfxContext.GetRenderStates().SetPremultipliedBlend(nux::SRC_OVER);
 
-  gfxContext.QRP_1Tex(base.x,
-                      base.y,
-                      base.width,
-                      base.height,
-                      _normalTexture[0]->GetDeviceTexture(),
-                      texxform,
-                      _premultiplied_color);
+  auto const& texture = _normalTexture[0]->GetDeviceTexture();
+  gfxContext.QRP_1Tex(base.x, base.y, base.width, base.height, texture, texxform, _premultiplied_color);
 
   gfxContext.GetRenderStates().SetBlend(false);
-
   gfxContext.PopClippingRectangle();
 }
 
-void
-QuicklistMenuItemSeparator::DrawContent(nux::GraphicsEngine& gfxContext,
-                                        bool                 forceDraw)
-{
-}
-
-void
-QuicklistMenuItemSeparator::PostDraw(nux::GraphicsEngine& gfxContext,
-                                     bool                 forceDraw)
-{
-}
-
-void
-QuicklistMenuItemSeparator::UpdateTexture()
-{
-  int width  = GetBaseWidth();
-  int height  = GetBaseHeight();
-
-  _cairoGraphics = new nux::CairoGraphics(CAIRO_FORMAT_ARGB32, width, height);
-  cairo_t* cr = _cairoGraphics->GetContext();
+void QuicklistMenuItemSeparator::UpdateTexture()
+{
+  int width = GetBaseWidth();
+  int height = GetBaseHeight();
+
+  nux::CairoGraphics cairoGraphics(CAIRO_FORMAT_ARGB32, width, height);
+  std::shared_ptr<cairo_t> cairo_context(cairoGraphics.GetContext(), cairo_destroy);
+  cairo_t* cr = cairo_context.get();
 
   cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
   cairo_set_source_rgba(cr, 0.0f, 0.0f, 0.0f, 0.0f);
@@ -166,21 +85,7 @@
   cairo_line_to(cr, width, 3.5f);
   cairo_stroke(cr);
 
-  if (_normalTexture[0])
-    _normalTexture[0]->UnReference();
-
-  _normalTexture[0] = texture_from_cairo_graphics(*_cairoGraphics);
-
-  cairo_destroy(cr);
-  delete _cairoGraphics;
-}
-
-int QuicklistMenuItemSeparator::CairoSurfaceWidth()
-{
-  if (_normalTexture[0])
-    return _normalTexture[0]->GetWidth();
-
-  return 0;
+  _normalTexture[0].Adopt(texture_from_cairo_graphics(cairoGraphics));
 }
 
 }
 
=== modified file 'launcher/QuicklistMenuItemSeparator.h'
--- launcher/QuicklistMenuItemSeparator.h	2012-05-25 20:49:27 +0000
+++ launcher/QuicklistMenuItemSeparator.h	2012-08-13 14:28:23 +0000
@@ -15,57 +15,32 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * Authored by: Mirco Müller <[e-mail]>
+ *              Marco Trevisan <[e-mail]>
  */
 
 #ifndef QUICKLISTMENUITEMSEPARATOR_H
 #define QUICKLISTMENUITEMSEPARATOR_H
 
-#include <Nux/Nux.h>
-#include <Nux/View.h>
-#include <NuxGraphics/CairoGraphics.h>
-
 #include "QuicklistMenuItem.h"
 
-#include <X11/Xlib.h>
-
 namespace unity
 {
 
 class QuicklistMenuItemSeparator : public QuicklistMenuItem
 {
 public:
-  QuicklistMenuItemSeparator(DbusmenuMenuitem* item,
-                             NUX_FILE_LINE_PROTO);
-
-  QuicklistMenuItemSeparator(DbusmenuMenuitem* item,
-                             bool              debug,
-                             NUX_FILE_LINE_PROTO);
-
-  ~QuicklistMenuItemSeparator();
+  QuicklistMenuItemSeparator(DbusmenuMenuitem* item, NUX_FILE_LINE_PROTO);
 
   virtual bool GetSelectable();
 
 protected:
-
-  void PreLayoutManagement();
-
-  long PostLayoutManagement(long layoutResult);
-
   void Draw(nux::GraphicsEngine& gfxContext, bool forceDraw);
-
-  void DrawContent(nux::GraphicsEngine& gfxContext, bool forceDraw);
-
-  void PostDraw(nux::GraphicsEngine& gfxContext, bool forceDraw);
+  std::string GetName() const;
 
   virtual void UpdateTexture();
 
-  //! Returns the width of the separator line as defined by the size of the _normalTexture.
-  virtual int CairoSurfaceWidth();
-
-  friend class QuicklistView;
-
 private:
-
+  nux::Color _color;
   nux::Color _premultiplied_color;
 };
 
 
=== modified file 'launcher/QuicklistView.cpp'
--- launcher/QuicklistView.cpp	2012-07-25 16:00:26 +0000
+++ launcher/QuicklistView.cpp	2012-08-13 14:28:23 +0000
@@ -147,7 +147,7 @@
     if (menu_item)
     {
       target_item = index;
-      menu_item->_prelight = true;
+      menu_item->Select();
     }
   }
 
@@ -448,13 +448,9 @@
       _item_layout->AddView(item, 1, nux::eCenter, nux::eFull);
     }
 
-    int  textWidth  = 0;
-    int  textHeight = 0;
-    item->GetTextExtents(textWidth, textHeight);
-    textHeight += QuicklistMenuItem::ITEM_MARGIN * 2;
-
-    MaxItemWidth = std::max(MaxItemWidth, textWidth);
-    TotalItemHeight += textHeight;
+    nux::Size const& text_extents = item->GetTextExtents();
+    MaxItemWidth = std::max(MaxItemWidth, text_extents.width);
+    TotalItemHeight += text_extents.height;
   }
 
   if (TotalItemHeight < _anchor_height)
@@ -510,11 +506,11 @@
   // only after MaxItemWidth is computed in QuicklistView::PreLayoutManagement.
   // The setting of the separator width is done here after the Layout cycle for this widget is over. The width of the separator
   // has bee set correctly during the layout cycle, but the cairo rendering still need to be adjusted.
-  int separator_width = _item_layout->GetBaseWidth();
+  unsigned separator_width = _item_layout->GetBaseWidth();
 
   for (auto item : _item_list)
   {
-    if (item->GetVisible() && item->CairoSurfaceWidth() != separator_width)
+    if (item->GetVisible() && item->GetCairoSurfaceWidth() != separator_width)
     {
       // Compute textures of the item.
       item->UpdateTexture();
@@ -567,14 +563,10 @@
 
 void QuicklistView::ActivateItem(QuicklistMenuItem* item)
 {
-  if (item && item->_menuItem)
-  {
-    ubus_server_send_message(ubus_server_get_default(),
-                             UBUS_PLACE_VIEW_CLOSE_REQUEST,
-                             NULL);
+  if (!item)
+    return;
 
-    dbusmenu_menuitem_handle_event(item->_menuItem, "clicked", NULL, 0);
-  }
+  item->Activate();
 }
 
 void QuicklistView::RecvItemMouseRelease(QuicklistMenuItem* item, int x, int y)
@@ -595,7 +587,7 @@
 {
   for (auto item : _item_list)
   {
-    item->_prelight = false;
+    item->Select(false);
   }
 }
 
@@ -760,7 +752,7 @@
   if (item)
     return item->GetItemType();
 
-  return MENUITEM_TYPE_UNKNOWN;
+  return QuicklistMenuItemType::UNKNOWN;
 }
 
 std::list<QuicklistMenuItem*> QuicklistView::GetChildren()
@@ -1310,42 +1302,6 @@
   UpdateTexture();
 }
 
-void QuicklistView::TestMenuItems(DbusmenuMenuitem* root)
-{
-  RemoveAllMenuItem();
-
-  if (root == 0)
-    return;
-
-  GList* child = NULL;
-  for (child = dbusmenu_menuitem_get_children(root); child != NULL; child = g_list_next(child))
-  {
-    const gchar* type = dbusmenu_menuitem_property_get((DbusmenuMenuitem*)child->data, DBUSMENU_MENUITEM_PROP_TYPE);
-    const gchar* toggle_type = dbusmenu_menuitem_property_get((DbusmenuMenuitem*)child->data, DBUSMENU_MENUITEM_PROP_TOGGLE_TYPE);
-
-    if (g_strcmp0(type, DBUSMENU_CLIENT_TYPES_SEPARATOR) == 0)
-    {
-      QuicklistMenuItemSeparator* item = new QuicklistMenuItemSeparator((DbusmenuMenuitem*)child->data, NUX_TRACKER_LOCATION);
-      AddMenuItem(item);
-    }
-    else if (g_strcmp0(toggle_type, DBUSMENU_MENUITEM_TOGGLE_CHECK) == 0)
-    {
-      QuicklistMenuItemCheckmark* item = new QuicklistMenuItemCheckmark((DbusmenuMenuitem*)child->data, NUX_TRACKER_LOCATION);
-      AddMenuItem(item);
-    }
-    else if (g_strcmp0(toggle_type, DBUSMENU_MENUITEM_TOGGLE_RADIO) == 0)
-    {
-      QuicklistMenuItemRadio* item = new QuicklistMenuItemRadio((DbusmenuMenuitem*)child->data, NUX_TRACKER_LOCATION);
-      AddMenuItem(item);
-    }
-    else //if (g_strcmp0 (type, DBUSMENU_MENUITEM_PROP_LABEL) == 0)
-    {
-      QuicklistMenuItemLabel* item = new QuicklistMenuItemLabel((DbusmenuMenuitem*)child->data, NUX_TRACKER_LOCATION);
-      AddMenuItem(item);
-    }
-  }
-}
-
 // Introspection
 
 std::string QuicklistView::GetName() const
 
=== modified file 'launcher/QuicklistView.h'
--- launcher/QuicklistView.h	2012-07-11 06:21:46 +0000
+++ launcher/QuicklistView.h	2012-08-13 14:28:23 +0000
@@ -22,9 +22,11 @@
 #define QUICKLISTVIEW_H
 
 #include <Nux/Nux.h>
+#include <Nux/VLayout.h>
+#include <Nux/HLayout.h>
 #include <Nux/BaseWindow.h>
+#include <Nux/TextureArea.h>
 #include <NuxGraphics/GraphicsEngine.h>
-#include <Nux/TextureArea.h>
 #include <NuxGraphics/CairoGraphics.h>
 
 #include <pango/pango.h>
 
=== modified file 'plugins/unityshell/src/unity-quicklist-menu-item-accessible.cpp'
--- plugins/unityshell/src/unity-quicklist-menu-item-accessible.cpp	2012-03-14 06:24:18 +0000
+++ plugins/unityshell/src/unity-quicklist-menu-item-accessible.cpp	2012-08-13 14:28:23 +0000
@@ -210,7 +210,7 @@
     menu_item = dynamic_cast<QuicklistMenuItem*>(nux_object_accessible_get_object(NUX_OBJECT_ACCESSIBLE(obj)));
     if (menu_item != NULL)
     {
-      name = menu_item->GetLabel();
+      name = menu_item->GetLabel().c_str();
     }
   }
 
 
=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2012-08-03 09:57:41 +0000
+++ tests/CMakeLists.txt	2012-08-13 14:28:23 +0000
@@ -62,18 +62,11 @@
 
 add_executable (test-unit
                 unit/TestMain.cpp
-                unit/TestQuicklistMenuitems.cpp
                 unit/TestPanelService.cpp
                 unit/TestUBus.cpp
                 unit/TestStaticCairoText.cpp
                 ${CMAKE_SOURCE_DIR}/launcher/CairoBaseWindow.cpp
                 ${CMAKE_SOURCE_DIR}/unity-shared/Introspectable.cpp
-                ${CMAKE_SOURCE_DIR}/launcher/QuicklistMenuItem.cpp
-                ${CMAKE_SOURCE_DIR}/launcher/QuicklistMenuItemCheckmark.cpp
-                ${CMAKE_SOURCE_DIR}/launcher/QuicklistMenuItemLabel.cpp
-                ${CMAKE_SOURCE_DIR}/launcher/QuicklistMenuItemRadio.cpp
-                ${CMAKE_SOURCE_DIR}/launcher/QuicklistMenuItemSeparator.cpp
-                ${CMAKE_SOURCE_DIR}/launcher/QuicklistView.cpp
                 ${CMAKE_SOURCE_DIR}/unity-shared/StaticCairoText.cpp
                 ../services/panel-service.c
                 ${CMAKE_CURRENT_BINARY_DIR}/panel-marshal.c
@@ -220,6 +213,8 @@
                  test_launcher_controller.cpp
                  test_keyboard_util.cpp
                  test_panel_style.cpp
+                 test_quicklist_menu_item.cpp
+                 test_quicklist_view.cpp
                  test_resultviewgrid.cpp
                  test_single_monitor_launcher_icon.cpp
                  test_switcher_controller.cpp
 
=== added file 'tests/test_quicklist_menu_item.cpp'
--- tests/test_quicklist_menu_item.cpp	1970-01-01 00:00:00 +0000
+++ tests/test_quicklist_menu_item.cpp	2012-08-13 14:28:23 +0000
@@ -0,0 +1,107 @@
+/*
+ * Copyright 2010-2012 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the  Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * version 3 along with this program.  If not, see
+ * <http://www.gnu.org/licenses/>
+ *
+ * Authored by: Marco Trevisan (Treviño) <[e-mail]>
+ *              Mirco Müller <[e-mail]>
+ */
+
+#include <gmock/gmock.h>
+#include <libdbusmenu-glib/client.h>
+
+#include "QuicklistMenuItem.h"
+#include "QuicklistMenuItemCheckmark.h"
+#include "QuicklistMenuItemLabel.h"
+#include "QuicklistMenuItemRadio.h"
+#include "QuicklistMenuItemSeparator.h"
+
+using namespace unity;
+using namespace testing;
+
+namespace
+{
+
+struct TestQuicklistMenuItem : public Test
+{
+  TestQuicklistMenuItem()
+    : item(dbusmenu_menuitem_new())
+  {}
+
+  glib::Object<DbusmenuMenuitem> item;
+};
+
+TEST_F(TestQuicklistMenuItem, QuicklistMenuItemCheckmark)
+{
+  dbusmenu_menuitem_property_set(item, DBUSMENU_MENUITEM_PROP_LABEL, "Unchecked");
+  dbusmenu_menuitem_property_set(item, DBUSMENU_MENUITEM_PROP_TOGGLE_TYPE,
+                                       DBUSMENU_MENUITEM_TOGGLE_CHECK);
+  dbusmenu_menuitem_property_set_bool(item, DBUSMENU_MENUITEM_PROP_ENABLED, false);
+  dbusmenu_menuitem_property_set_int(item, DBUSMENU_MENUITEM_PROP_TOGGLE_STATE,
+                                           DBUSMENU_MENUITEM_TOGGLE_STATE_UNCHECKED);
+
+  nux::ObjectPtr<QuicklistMenuItemCheckmark> qlitem(new QuicklistMenuItemCheckmark(item));
+
+  EXPECT_EQ(qlitem->GetLabel(), "Unchecked");
+  EXPECT_FALSE(qlitem->GetEnabled());
+  EXPECT_FALSE(qlitem->GetActive());
+  EXPECT_FALSE(qlitem->GetSelectable());
+  EXPECT_FALSE(qlitem->IsMarkupEnabled());
+}
+
+TEST_F(TestQuicklistMenuItem, QuicklistMenuItemLabel)
+{
+  dbusmenu_menuitem_property_set(item, DBUSMENU_MENUITEM_PROP_LABEL, "A Label");
+  dbusmenu_menuitem_property_set_bool(item, DBUSMENU_MENUITEM_PROP_ENABLED, true);
+  dbusmenu_menuitem_property_set_bool(item, "unity-use-markup", true);
+
+  nux::ObjectPtr<QuicklistMenuItemLabel> qlitem(new QuicklistMenuItemLabel(item));
+
+  EXPECT_EQ(qlitem->GetLabel(), "A Label");
+  EXPECT_TRUE(qlitem->GetEnabled());
+  EXPECT_TRUE(qlitem->GetSelectable());
+  EXPECT_TRUE(qlitem->IsMarkupEnabled());
+}
+
+TEST_F(TestQuicklistMenuItem, QuicklistMenuItemRadio)
+{
+  dbusmenu_menuitem_property_set(item, DBUSMENU_MENUITEM_PROP_LABEL, "Radio Active");
+  dbusmenu_menuitem_property_set(item, DBUSMENU_MENUITEM_PROP_TOGGLE_TYPE,
+                                       DBUSMENU_MENUITEM_TOGGLE_RADIO);
+  dbusmenu_menuitem_property_set_bool(item, DBUSMENU_MENUITEM_PROP_ENABLED, true);
+  dbusmenu_menuitem_property_set_int(item, DBUSMENU_MENUITEM_PROP_TOGGLE_STATE,
+                                           DBUSMENU_MENUITEM_TOGGLE_STATE_CHECKED);
+
+  nux::ObjectPtr<QuicklistMenuItemRadio> qlitem(new QuicklistMenuItemRadio(item));
+  qlitem->EnableLabelMarkup(true);
+
+  EXPECT_EQ(qlitem->GetLabel(), "Radio Active");
+  EXPECT_TRUE(qlitem->GetEnabled());
+  EXPECT_TRUE(qlitem->GetActive());
+  EXPECT_TRUE(qlitem->GetSelectable());
+  EXPECT_TRUE(qlitem->IsMarkupEnabled());
+}
+
+TEST_F(TestQuicklistMenuItem, QuicklistMenuItemSeparator)
+{
+  dbusmenu_menuitem_property_set(item, "type", DBUSMENU_CLIENT_TYPES_SEPARATOR);
+  dbusmenu_menuitem_property_set_bool(item, DBUSMENU_MENUITEM_PROP_ENABLED, true);
+
+  nux::ObjectPtr<QuicklistMenuItemSeparator> qlitem(new QuicklistMenuItemSeparator(item));
+
+  EXPECT_TRUE(qlitem->GetEnabled());
+  EXPECT_FALSE(qlitem->GetSelectable());
+}
+
+}
 
=== added file 'tests/test_quicklist_view.cpp'
--- tests/test_quicklist_view.cpp	1970-01-01 00:00:00 +0000
+++ tests/test_quicklist_view.cpp	2012-08-13 14:28:23 +0000
@@ -0,0 +1,124 @@
+/*
+ * Copyright 2010-2012 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the  Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * version 3 along with this program.  If not, see
+ * <http://www.gnu.org/licenses/>
+ *
+ * Authored by: Marco Trevisan (Treviño) <[e-mail]>
+ *              Mirco Müller <[e-mail]>
+ */
+
+#include <gmock/gmock.h>
+#include <libdbusmenu-glib/client.h>
+
+#include "QuicklistView.h"
+#include "QuicklistMenuItemCheckmark.h"
+#include "QuicklistMenuItemLabel.h"
+#include "QuicklistMenuItemRadio.h"
+#include "QuicklistMenuItemSeparator.h"
+
+using namespace unity;
+using namespace testing;
+
+namespace
+{
+
+struct TestQuicklistView : public Test
+{
+  TestQuicklistView()
+    : quicklist(new QuicklistView())
+  {}
+
+  void AddMenuItems(DbusmenuMenuitem* root)
+  {
+    quicklist->RemoveAllMenuItem();
+
+    if (!root)
+      return;
+
+    for (GList* child = dbusmenu_menuitem_get_children(root); child; child = child->next)
+    {
+      const gchar* type = dbusmenu_menuitem_property_get((DbusmenuMenuitem*)child->data, DBUSMENU_MENUITEM_PROP_TYPE);
+      const gchar* toggle_type = dbusmenu_menuitem_property_get((DbusmenuMenuitem*)child->data, DBUSMENU_MENUITEM_PROP_TOGGLE_TYPE);
+
+      if (g_strcmp0(type, DBUSMENU_CLIENT_TYPES_SEPARATOR) == 0)
+      {
+        QuicklistMenuItemSeparator* item = new QuicklistMenuItemSeparator((DbusmenuMenuitem*)child->data, NUX_TRACKER_LOCATION);
+        quicklist->AddMenuItem(item);
+      }
+      else if (g_strcmp0(toggle_type, DBUSMENU_MENUITEM_TOGGLE_CHECK) == 0)
+      {
+        QuicklistMenuItemCheckmark* item = new QuicklistMenuItemCheckmark((DbusmenuMenuitem*)child->data, NUX_TRACKER_LOCATION);
+        quicklist->AddMenuItem(item);
+      }
+      else if (g_strcmp0(toggle_type, DBUSMENU_MENUITEM_TOGGLE_RADIO) == 0)
+      {
+        QuicklistMenuItemRadio* item = new QuicklistMenuItemRadio((DbusmenuMenuitem*)child->data, NUX_TRACKER_LOCATION);
+        quicklist->AddMenuItem(item);
+      }
+      else //if (g_strcmp0 (type, DBUSMENU_MENUITEM_PROP_LABEL) == 0)
+      {
+        QuicklistMenuItemLabel* item = new QuicklistMenuItemLabel((DbusmenuMenuitem*)child->data, NUX_TRACKER_LOCATION);
+        quicklist->AddMenuItem(item);
+      }
+    }
+  }
+
+  nux::ObjectPtr<QuicklistView> quicklist;
+};
+
+TEST_F(TestQuicklistView, AddItems)
+{
+  glib::Object<DbusmenuMenuitem> root(dbusmenu_menuitem_new());
+
+  dbusmenu_menuitem_set_root(root, true);
+
+  DbusmenuMenuitem* child = dbusmenu_menuitem_new();
+  dbusmenu_menuitem_property_set(child, DBUSMENU_MENUITEM_PROP_TYPE, DBUSMENU_MENUITEM_PROP_LABEL);
+  dbusmenu_menuitem_property_set(child, DBUSMENU_MENUITEM_PROP_LABEL, "label 0");
+  dbusmenu_menuitem_property_set_bool(child, DBUSMENU_MENUITEM_PROP_ENABLED, true);
+  dbusmenu_menuitem_child_append(root, child);
+
+  child = dbusmenu_menuitem_new();
+  dbusmenu_menuitem_property_set(child, DBUSMENU_MENUITEM_PROP_TYPE, DBUSMENU_CLIENT_TYPES_SEPARATOR);
+  dbusmenu_menuitem_property_set_bool(child, DBUSMENU_MENUITEM_PROP_ENABLED, true);
+  dbusmenu_menuitem_child_append(root, child);
+
+  child = dbusmenu_menuitem_new();
+  dbusmenu_menuitem_property_set(child, DBUSMENU_MENUITEM_PROP_TYPE, DBUSMENU_MENUITEM_PROP_LABEL);
+  dbusmenu_menuitem_property_set(child, DBUSMENU_MENUITEM_PROP_LABEL, "label 1");
+  dbusmenu_menuitem_property_set_bool(child, DBUSMENU_MENUITEM_PROP_ENABLED, true);
+  dbusmenu_menuitem_child_append(root, child);
+
+  child = dbusmenu_menuitem_new();
+  dbusmenu_menuitem_property_set(child, DBUSMENU_MENUITEM_PROP_TOGGLE_TYPE, DBUSMENU_MENUITEM_TOGGLE_CHECK);
+  dbusmenu_menuitem_property_set(child, DBUSMENU_MENUITEM_PROP_LABEL, "check mark 0");
+  dbusmenu_menuitem_property_set_bool(child, DBUSMENU_MENUITEM_PROP_ENABLED, true);
+  dbusmenu_menuitem_property_set_int(child, DBUSMENU_MENUITEM_PROP_TOGGLE_STATE, DBUSMENU_MENUITEM_TOGGLE_STATE_UNCHECKED);
+  dbusmenu_menuitem_child_append(root, child);
+
+  AddMenuItems(root);
+
+  ASSERT_EQ(quicklist->GetChildren().size(), 4);
+  ASSERT_EQ(quicklist->GetNumItems(), 4);
+  EXPECT_EQ(quicklist->GetNthType(0), unity::QuicklistMenuItemType::LABEL);
+  EXPECT_EQ(quicklist->GetNthType(1), unity::QuicklistMenuItemType::SEPARATOR);
+  EXPECT_EQ(quicklist->GetNthType(2), unity::QuicklistMenuItemType::LABEL);
+  EXPECT_EQ(quicklist->GetNthType(3), unity::QuicklistMenuItemType::CHECK);
+
+  EXPECT_EQ(quicklist->GetNthItems(0)->GetLabel(), "label 0");
+  EXPECT_EQ(quicklist->GetNthItems(2)->GetLabel(), "label 1");
+  EXPECT_EQ(quicklist->GetNthItems(3)->GetLabel(), "check mark 0");
+}
+
+}
 
=== modified file 'tests/unit/TestMain.cpp'
--- tests/unit/TestMain.cpp	2012-01-25 15:59:13 +0000
+++ tests/unit/TestMain.cpp	2012-08-13 14:28:23 +0000
@@ -27,7 +27,6 @@
 
 void TestPanelServiceCreateSuite();
 void TestUBusCreateSuite();
-void TestQuicklistMenuitemsCreateSuite();
 void TestStaticCairoTextCreateSuite();
 
 nux::WindowThread*
@@ -71,7 +70,6 @@
 
   //Keep alphabetical please
   TestPanelServiceCreateSuite();
-  TestQuicklistMenuitemsCreateSuite();
   TestStaticCairoTextCreateSuite();
   TestUBusCreateSuite();
 
 
=== removed file 'tests/unit/TestQuicklistMenuitems.cpp'
--- tests/unit/TestQuicklistMenuitems.cpp	2012-04-13 16:02:59 +0000
+++ tests/unit/TestQuicklistMenuitems.cpp	1970-01-01 00:00:00 +0000
@@ -1,258 +0,0 @@
-/*
- * Copyright 2010 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the  Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * version 3 along with this program.  If not, see
- * <http://www.gnu.org/licenses/>
- *
- * Authored by: Mirco Müller <[e-mail]>
- *
- */
-
-#include "config.h"
-
-#include "QuicklistMenuItem.h"
-#include "QuicklistMenuItemCheckmark.h"
-#include "QuicklistMenuItemLabel.h"
-#include "QuicklistMenuItemRadio.h"
-#include "QuicklistMenuItemSeparator.h"
-
-#include "Nux/Nux.h"
-#include "Nux/VLayout.h"
-#include "Nux/HLayout.h"
-#include "Nux/WindowThread.h"
-#include "Nux/WindowCompositor.h"
-#include "Nux/BaseWindow.h"
-
-#include "QuicklistView.h"
-#include "TestThreadHelper.h"
-
-using unity::QuicklistView;
-using unity::QuicklistMenuItem;
-using unity::QuicklistMenuItemCheckmark;
-using unity::QuicklistMenuItemLabel;
-using unity::QuicklistMenuItemRadio;
-using unity::QuicklistMenuItemSeparator;
-
-static void TestMenuItemCheckmark(void);
-static void TestMenuItemLabel(void);
-static void TestMenuItemRadio(void);
-static void TestMenuItemSeparator(void);
-static void TestQuicklistMenuItem(void);
-
-nux::WindowThread* thread = NULL;
-
-void
-TestQuicklistMenuitemsCreateSuite()
-{
-#define _DOMAIN "/Unit/QuicklistMenuitems"
-
-  g_test_add_func(_DOMAIN"/MenuItemCheckmark", TestMenuItemCheckmark);
-  g_test_add_func(_DOMAIN"/MenuItemLabel",     TestMenuItemLabel);
-  g_test_add_func(_DOMAIN"/MenuItemRadio",     TestMenuItemRadio);
-  g_test_add_func(_DOMAIN"/MenuItemSeparator", TestMenuItemSeparator);
-  g_test_add_func(_DOMAIN"/QuicklistMenuItem", TestQuicklistMenuItem);
-}
-
-static void
-TestMenuItemCheckmark()
-{
-  DbusmenuMenuitem* item = NULL;
-
-
-  item = dbusmenu_menuitem_new();
-
-  dbusmenu_menuitem_property_set(item,
-                                 DBUSMENU_MENUITEM_PROP_LABEL,
-                                 "Unchecked");
-
-  dbusmenu_menuitem_property_set(item,
-                                 DBUSMENU_MENUITEM_PROP_TOGGLE_TYPE,
-                                 DBUSMENU_MENUITEM_TOGGLE_CHECK);
-
-  dbusmenu_menuitem_property_set_bool(item,
-                                      DBUSMENU_MENUITEM_PROP_ENABLED,
-                                      false);
-
-  dbusmenu_menuitem_property_set_int(item,
-                                     DBUSMENU_MENUITEM_PROP_TOGGLE_STATE,
-                                     DBUSMENU_MENUITEM_TOGGLE_STATE_UNCHECKED);
-
-  QuicklistMenuItemCheckmark* qlCheckmarkItem = NULL;
-
-  qlCheckmarkItem = new QuicklistMenuItemCheckmark(item, true);
-
-  g_assert_cmpstr(qlCheckmarkItem->GetLabel(), == , "Unchecked");
-  g_assert_cmpint(qlCheckmarkItem->GetEnabled(), == , false);
-  g_assert_cmpint(qlCheckmarkItem->GetActive(), == , false);
-  g_assert_cmpint(qlCheckmarkItem->GetSelectable(), == , false);
-  g_assert_cmpint(qlCheckmarkItem->IsMarkupEnabled(), == , false);
-
-  //qlCheckmarkItem->sigChanged.connect (sigc::mem_fun (pointerToCallerClass,
-  //                                                    &CallerClass::RecvChanged));
-
-
-  qlCheckmarkItem->Dispose();
-  g_object_unref(item);
-}
-
-static void
-TestMenuItemLabel()
-{
-  DbusmenuMenuitem* item = NULL;
-
-  item = dbusmenu_menuitem_new();
-
-  dbusmenu_menuitem_property_set(item,
-                                 DBUSMENU_MENUITEM_PROP_LABEL,
-                                 "A Label");
-
-  dbusmenu_menuitem_property_set_bool(item,
-                                      DBUSMENU_MENUITEM_PROP_ENABLED,
-                                      true);
-
-  dbusmenu_menuitem_property_set_bool(item,
-                                      "unity-use-markup",
-                                      true);
-
-  QuicklistMenuItemLabel* qlLabelItem = NULL;
-
-  qlLabelItem = new QuicklistMenuItemLabel(item, true);
-
-  g_assert_cmpstr(qlLabelItem->GetLabel(), == , "A Label");
-  g_assert_cmpint(qlLabelItem->GetEnabled(), == , true);
-  g_assert_cmpint(qlLabelItem->GetSelectable(), == , true);
-  g_assert_cmpint(qlLabelItem->IsMarkupEnabled(), == , true);
-
-  //qlLabelItem->sigChanged.connect (sigc::mem_fun (pointerToCallerClass,
-  //                                                &CallerClass::RecvChanged));
-
-  qlLabelItem->Dispose();
-  g_object_unref(item);
-}
-
-static void
-TestMenuItemRadio()
-{
-  DbusmenuMenuitem* item = NULL;
-
-  item = dbusmenu_menuitem_new();
-
-  dbusmenu_menuitem_property_set(item,
-                                 DBUSMENU_MENUITEM_PROP_LABEL,
-                                 "Radio Active");
-
-  dbusmenu_menuitem_property_set(item,
-                                 DBUSMENU_MENUITEM_PROP_TOGGLE_TYPE,
-                                 DBUSMENU_MENUITEM_TOGGLE_RADIO);
-
-  dbusmenu_menuitem_property_set_bool(item,
-                                      DBUSMENU_MENUITEM_PROP_ENABLED,
-                                      true);
-
-  dbusmenu_menuitem_property_set_int(item,
-                                     DBUSMENU_MENUITEM_PROP_TOGGLE_STATE,
-                                     DBUSMENU_MENUITEM_TOGGLE_STATE_CHECKED);
-
-  QuicklistMenuItemRadio* qlRadioItem = NULL;
-
-  qlRadioItem = new QuicklistMenuItemRadio(item, true);
-  qlRadioItem->EnableLabelMarkup(true);
-
-  g_assert_cmpstr(qlRadioItem->GetLabel(), == , "Radio Active");
-  g_assert_cmpint(qlRadioItem->GetEnabled(), == , true);
-  g_assert_cmpint(qlRadioItem->GetActive(), == , true);
-  g_assert_cmpint(qlRadioItem->GetSelectable(), == , true);
-  g_assert_cmpint(qlRadioItem->IsMarkupEnabled(), == , true);
-
-  //qlRadioItem->sigChanged.connect (sigc::mem_fun (pointerToCallerClass,
-  //                                                &CallerClass::RecvChanged));
-
-  qlRadioItem->Dispose();
-  g_object_unref(item);
-}
-
-static void
-TestMenuItemSeparator()
-{
-  DbusmenuMenuitem* item = NULL;
-
-  item = dbusmenu_menuitem_new();
-
-  dbusmenu_menuitem_property_set(item,
-                                 "type",
-                                 DBUSMENU_CLIENT_TYPES_SEPARATOR);
-
-  dbusmenu_menuitem_property_set_bool(item,
-                                      DBUSMENU_MENUITEM_PROP_ENABLED,
-                                      true);
-
-  QuicklistMenuItemSeparator* qlSeparatorItem = NULL;
-
-  qlSeparatorItem = new QuicklistMenuItemSeparator(item, true);
-
-  g_assert_cmpint(qlSeparatorItem->GetEnabled(), == , true);
-  g_assert_cmpint(qlSeparatorItem->GetSelectable(), == , false);
-
-  qlSeparatorItem->Dispose();
-  g_object_unref(item);
-}
-
-static void
-TestQuicklistMenuItem()
-{
-  DbusmenuMenuitem* root = dbusmenu_menuitem_new();
-
-  dbusmenu_menuitem_set_root(root, true);
-
-  DbusmenuMenuitem* child = dbusmenu_menuitem_new();
-  dbusmenu_menuitem_property_set(child, DBUSMENU_MENUITEM_PROP_TYPE, DBUSMENU_MENUITEM_PROP_LABEL);
-  dbusmenu_menuitem_property_set(child, DBUSMENU_MENUITEM_PROP_LABEL, "label 0");
-  dbusmenu_menuitem_property_set_bool(child, DBUSMENU_MENUITEM_PROP_ENABLED, true);
-  dbusmenu_menuitem_child_append(root, child);
-
-  child = dbusmenu_menuitem_new();
-  dbusmenu_menuitem_property_set(child, DBUSMENU_MENUITEM_PROP_TYPE, DBUSMENU_CLIENT_TYPES_SEPARATOR);
-  dbusmenu_menuitem_property_set_bool(child, DBUSMENU_MENUITEM_PROP_ENABLED, true);
-  dbusmenu_menuitem_child_append(root, child);
-
-  child = dbusmenu_menuitem_new();
-  dbusmenu_menuitem_property_set(child, DBUSMENU_MENUITEM_PROP_TYPE, DBUSMENU_MENUITEM_PROP_LABEL);
-  dbusmenu_menuitem_property_set(child, DBUSMENU_MENUITEM_PROP_LABEL, "label 1");
-  dbusmenu_menuitem_property_set_bool(child, DBUSMENU_MENUITEM_PROP_ENABLED, true);
-  dbusmenu_menuitem_child_append(root, child);
-
-  child = dbusmenu_menuitem_new();
-  dbusmenu_menuitem_property_set(child, DBUSMENU_MENUITEM_PROP_TOGGLE_TYPE, DBUSMENU_MENUITEM_TOGGLE_CHECK);
-  dbusmenu_menuitem_property_set(child, DBUSMENU_MENUITEM_PROP_LABEL, "check mark 0");
-  dbusmenu_menuitem_property_set_bool(child, DBUSMENU_MENUITEM_PROP_ENABLED, true);
-  dbusmenu_menuitem_property_set_int(child, DBUSMENU_MENUITEM_PROP_TOGGLE_STATE, DBUSMENU_MENUITEM_TOGGLE_STATE_UNCHECKED);
-  dbusmenu_menuitem_child_append(root, child);
-
-  QuicklistView* quicklist = new QuicklistView();
-
-  quicklist->TestMenuItems(root);
-
-  g_assert_cmpint(quicklist->GetNumItems(), == , 4);
-  g_assert_cmpint(quicklist->GetNthType(0), == , unity::MENUITEM_TYPE_LABEL);
-  g_assert_cmpint(quicklist->GetNthType(1), == , unity::MENUITEM_TYPE_SEPARATOR);
-  g_assert_cmpint(quicklist->GetNthType(2), == , unity::MENUITEM_TYPE_LABEL);
-  g_assert_cmpint(quicklist->GetNthType(3), == , unity::MENUITEM_TYPE_CHECK);
-
-  g_assert_cmpstr(quicklist->GetNthItems(0)->GetLabel(), == , "label 0");
-  g_assert_cmpstr(quicklist->GetNthItems(2)->GetLabel(), == , "label 1");
-  g_assert_cmpstr(quicklist->GetNthItems(3)->GetLabel(), == , "check mark 0");
-
-  g_assert_cmpint(quicklist->GetChildren().size(), == , 4);
-
-  quicklist->Dispose();
-}