Merge lp:~unity-team/unity/fixes-2011-03-28 into lp:unity

[Neil J. Patel]

Bugs linked

[Jason Smith (jassmith)]

+1, awesome work, fixes much many crashes

review: Approve

=== modified file 'src/IndicatorObjectFactoryRemote.cpp'
--- src/IndicatorObjectFactoryRemote.cpp	2011-03-17 14:16:13 +0000
+++ src/IndicatorObjectFactoryRemote.cpp	2011-03-31 19:28:30 +0000
@@ -406,6 +406,11 @@
   g_free (uname);
 }
 
+GDBusProxy *
+IndicatorObjectFactoryRemote::GetRemoteProxy ()
+{
+  return _proxy;
+}
   
 //
 // C callbacks, they just link to class methods and aren't interesting
 
=== modified file 'src/IndicatorObjectFactoryRemote.h'
--- src/IndicatorObjectFactoryRemote.h	2011-03-17 09:41:28 +0000
+++ src/IndicatorObjectFactoryRemote.h	2011-03-31 19:28:30 +0000
@@ -50,6 +50,8 @@
 
   void AddProperties (GVariantBuilder *builder);
 
+  GDBusProxy * GetRemoteProxy ();
+
 private:
   IndicatorObjectProxyRemote* IndicatorForID (const char *id);
 private:
 
=== modified file 'src/PanelController.cpp'
--- src/PanelController.cpp	2011-03-29 12:23:52 +0000
+++ src/PanelController.cpp	2011-03-31 19:28:30 +0000
@@ -25,7 +25,8 @@
 
 PanelController::PanelController ()
 : _bfb_size (66),
-  _opacity (1.0f)
+  _opacity (1.0f),
+  _open_menu_start_received (false)
 {
   UScreen *screen = UScreen::GetDefault ();
 
@@ -63,6 +64,8 @@
 
     view->StartFirstMenuShow ();
   }
+
+  _open_menu_start_received = true;
 }
 
 void
@@ -70,6 +73,10 @@
 {
   std::vector<nux::BaseWindow *>::iterator it, eit = _windows.end ();
 
+  if (!_open_menu_start_received)
+    return;
+  _open_menu_start_received = false;
+
   for (it = _windows.begin (); it != eit; ++it)
   {
     PanelView *view = ViewForWindow (*it);
 
=== modified file 'src/PanelController.h'
--- src/PanelController.h	2011-03-29 12:23:52 +0000
+++ src/PanelController.h	2011-03-31 19:28:30 +0000
@@ -55,6 +55,8 @@
   float _opacity;
   
   sigc::connection _on_screen_change_connection;
+
+  bool _open_menu_start_received;
 };
 
 #endif // _PANEL_CONTROLLER_H_
 
=== modified file 'src/PanelHomeButton.cpp'
--- src/PanelHomeButton.cpp	2011-03-29 12:23:52 +0000
+++ src/PanelHomeButton.cpp	2011-03-31 19:28:30 +0000
@@ -113,10 +113,13 @@
   cairo_set_line_width (cr, 1);
 
   pixbuf = PanelStyle::GetDefault ()->GetHomeButton ();
-  gdk_cairo_set_source_pixbuf (cr, pixbuf,
-                               (_button_width-gdk_pixbuf_get_width (pixbuf))/2,
-                               (PANEL_HEIGHT-gdk_pixbuf_get_height (pixbuf))/2);
-  g_object_unref (pixbuf);
+  if (GDK_IS_PIXBUF (pixbuf))
+  {
+    gdk_cairo_set_source_pixbuf (cr, pixbuf,
+                                 (_button_width-gdk_pixbuf_get_width (pixbuf))/2,
+                                 (PANEL_HEIGHT-gdk_pixbuf_get_height (pixbuf))/2);
+    g_object_unref (pixbuf);
+  }
 
   cairo_paint (cr);
 
 
=== modified file 'src/PanelMenuView.cpp'
--- src/PanelMenuView.cpp	2011-03-30 00:29:57 +0000
+++ src/PanelMenuView.cpp	2011-03-31 19:28:30 +0000
@@ -1066,3 +1066,9 @@
 {
   return _we_control_active;
 }
+
+bool
+PanelMenuView::HasOurWindowFocused ()
+{
+  return _is_own_window;
+}
 
=== modified file 'src/PanelMenuView.h'
--- src/PanelMenuView.h	2011-03-29 12:23:52 +0000
+++ src/PanelMenuView.h	2011-03-31 19:28:30 +0000
@@ -93,6 +93,8 @@
   void SetMonitor (int monitor);
   bool GetControlsActive ();
 
+  bool HasOurWindowFocused ();
+
 protected:
   const gchar * GetName ();
   const gchar * GetChildsName ();
 
=== modified file 'src/PanelView.cpp'
--- src/PanelView.cpp	2011-03-29 12:23:52 +0000
+++ src/PanelView.cpp	2011-03-31 19:28:30 +0000
@@ -37,10 +37,6 @@
 #include "IndicatorObjectFactoryRemote.h"
 #include "PanelIndicatorObjectView.h"
 
-#define S_NAME  "com.canonical.Unity.Panel.Service"
-#define S_PATH  "/com/canonical/Unity/Panel/Service"
-#define S_IFACE "com.canonical.Unity.Panel.Service"
-
 NUX_IMPLEMENT_OBJECT_TYPE (PanelView);
 
 PanelView::PanelView (NUX_FILE_LINE_DECL)
@@ -289,7 +285,8 @@
     {
       PanelIndicatorObjectView *view = static_cast<PanelIndicatorObjectView *> (*it);
       
-      if (view->_layout == NULL)
+      if (view->_layout == NULL
+          || (view == _menu_view && _menu_view->HasOurWindowFocused ()))
         continue;
 
       geo = view->GetAbsoluteGeometry ();
@@ -391,7 +388,8 @@
   {
     PanelIndicatorObjectView *view = static_cast<PanelIndicatorObjectView *> (*it);
 
-    if (view->_layout == NULL)
+    if (view->_layout == NULL
+        || (view == _menu_view && _menu_view->HasOurWindowFocused ()))
       continue;
 
     std::list<Area *>::iterator it2;
@@ -430,22 +428,6 @@
   return _is_primary;
 }
 
-static void
-on_sync_geometries_done_cb (GObject      *source,
-                            GAsyncResult *res,
-                            gpointer      data)
-{
-  GVariant *args;
-  GError *error = NULL;
-
-  args = g_dbus_proxy_call_finish ((GDBusProxy*) source, res, &error);
-  if (error != NULL)
-  {
-    g_warning ("Error when calling SyncGeometries: %s", error->message);
-    g_error_free (error);
-  }
-}
-
 void
 PanelView::SetPrimary (bool primary)
 {
@@ -458,8 +440,8 @@
 PanelView::SyncGeometries ()
 {
   GVariantBuilder b;
-  GDBusProxy *bus_proxy;
-  GVariant *method_args;
+  GDBusProxy     *bus_proxy;
+  GVariant       *method_args;
   std::list<Area *>::iterator it;
 
   g_variant_builder_init (&b, G_VARIANT_TYPE ("(a(ssiiii))"));
@@ -499,26 +481,16 @@
   method_args = g_variant_builder_end (&b);
 
   // Send geometries to the panel service
-  bus_proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION,
-                                             G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
-                                             NULL,
-                                             S_NAME,
-                                             S_PATH,
-                                             S_IFACE,
-                                             NULL,
-                                             NULL);
+  bus_proxy =_remote->GetRemoteProxy ();
   if (bus_proxy != NULL)
   {
     g_dbus_proxy_call (bus_proxy, "SyncGeometries", method_args,
                        G_DBUS_CALL_FLAGS_NONE,
                        -1,
                        NULL,
-                       on_sync_geometries_done_cb,
-                       this);
-    g_object_unref (bus_proxy);
+                       NULL,
+                       NULL);
   }
-
-  g_variant_unref (method_args);
 }
 
 void
 
=== modified file 'src/PlacesGroupController.cpp'
--- src/PlacesGroupController.cpp	2011-03-23 18:26:57 +0000
+++ src/PlacesGroupController.cpp	2011-03-31 19:28:30 +0000
@@ -23,11 +23,13 @@
 
 #include "PlacesStyle.h"
 #include "PlacesSimpleTile.h"
+#include "PlacesHorizontalTile.h"
 
 static const guint kPadding = 4;
 
 PlacesGroupController::PlacesGroupController (PlaceEntry *entry, PlaceEntryGroup& group)
-: _entry (entry),
+: _type (RENDERER_TYPE_DEFAULT),
+  _entry (entry),
   _group (NULL),
   _check_tiles_id (0)
 {
@@ -39,17 +41,23 @@
   _group->SetName(group.GetName ());
   _group->SetIcon (group.GetIcon ());
 
+  if (g_strcmp0 (group.GetRenderer (), "UnityHorizontalTileRenderer") == 0)
+    _type = RENDERER_TYPE_HORI_TILE;
+  
   nux::GridHLayout *layout = new nux::GridHLayout (NUX_TRACKER_LOCATION);
   layout->ForceChildrenSize (true);
-  layout->SetChildrenSize (style->GetTileWidth (), style->GetTileHeight ());
   layout->EnablePartialVisibility (false);
-
   layout->SetVerticalExternalMargin (kPadding);
   layout->SetHorizontalExternalMargin (kPadding);
   layout->SetVerticalInternalMargin (kPadding);
   layout->SetHorizontalInternalMargin (kPadding);
   layout->SetHeightMatchContent (true);
 
+  if (_type == RENDERER_TYPE_HORI_TILE)
+    layout->SetChildrenSize (style->GetTileWidth () * 2, style->GetTileIconSize () + 24); //padding
+  else
+    layout->SetChildrenSize (style->GetTileWidth (), style->GetTileHeight ());
+
   _group->SetChildLayout (layout);
   _group->SetVisible (false);
   _group->SetExpanded (false);
@@ -57,11 +65,19 @@
   _group->expanded.connect (sigc::mem_fun (this, &PlacesGroupController::CheckTiles));
   style->columns_changed.connect (sigc::mem_fun (this, &PlacesGroupController::CheckTiles));
 
-  _more_tile = new PlacesSimpleTile ("gtk-add",
-                                     _("Load more results..."),
-                                     style->GetTileIconSize (),
-                                     false,
-                                     "more-tile");
+  if (_type == RENDERER_TYPE_HORI_TILE)
+    _more_tile = new PlacesHorizontalTile ("gtk-add",
+                                           _("Load more results..."),
+                                           "",
+                                           style->GetTileIconSize (),
+                                           false,
+                                           "more-tile");
+  else
+    _more_tile = new PlacesSimpleTile ("gtk-add",
+                                       _("Load more results..."),
+                                       style->GetTileIconSize (),
+                                       false,
+                                       "more-tile");
   _more_tile->Reference ();
   _more_tile->sigClick.connect (sigc::mem_fun (this, &PlacesGroupController::MoreTileClicked));
 }
@@ -95,17 +111,27 @@
 
   gchar            *result_name;
   const gchar      *result_icon;
-  PlacesSimpleTile *tile;
+  gchar            *result_comment;
+  PlacesTile       *tile;
 
   result_name = g_markup_escape_text (result.GetName (), -1);
+  result_comment = g_markup_escape_text (result.GetComment (), -1);
   result_icon = result.GetIcon ();
 
-  tile = new PlacesSimpleTile (result_icon,
-                               result_name,
-                               style->GetTileIconSize (),
-                               false,
-                               result.GetId ());
-  tile->SetURI (result.GetURI ());
+  if (_type == RENDERER_TYPE_HORI_TILE)
+    tile = new PlacesHorizontalTile (result_icon,
+                                     result_name,
+                                     result_comment,
+                                     style->GetTileIconSize (),
+                                     false,
+                                     result.GetId ());
+  else
+    tile = new PlacesSimpleTile (result_icon,
+                                 result_name,
+                                 style->GetTileIconSize (),
+                                 false,
+                                 result.GetId ());
+
   tile->QueueRelayout ();
   tile->sigClick.connect (sigc::mem_fun (this, &PlacesGroupController::TileClicked));
 
@@ -116,6 +142,7 @@
   _group->SetVisible (true);
 
   g_free (result_name);
+  g_free (result_comment);
 }
 
 void
 
=== modified file 'src/PlacesGroupController.h'
--- src/PlacesGroupController.h	2011-03-20 16:33:05 +0000
+++ src/PlacesGroupController.h	2011-03-31 19:28:30 +0000
@@ -27,6 +27,12 @@
 #include "PlacesGroup.h"
 #include "PlacesTile.h"
 
+enum PlacesGroupRendererType
+{
+  RENDERER_TYPE_DEFAULT = 0,
+  RENDERER_TYPE_HORI_TILE
+};
+
 class PlacesGroupController : public nux::Object, public Introspectable
 {
 public:
@@ -57,6 +63,7 @@
   void MoreTileClicked (PlacesTile *tile);
 
 private:
+  PlacesGroupRendererType _type;
   PlaceEntry  *_entry;
   PlacesGroup *_group;
   const void  *_id;
 
=== added file 'src/PlacesHorizontalTile.cpp'
--- src/PlacesHorizontalTile.cpp	1970-01-01 00:00:00 +0000
+++ src/PlacesHorizontalTile.cpp	2011-03-31 19:28:30 +0000
@@ -0,0 +1,244 @@
+/*
+ * 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: Neil Jagdish Patel <[e-mail]>
+ *
+ */
+
+#include "PlacesSettings.h"
+#include "PlacesSettings.h"
+#include "ubus-server.h"
+#include "UBusMessages.h"
+
+#include "PlacesHorizontalTile.h"
+
+#include <Nux/HLayout.h>
+#include <NuxImage/GdkGraphics.h>
+#include <gtk/gtk.h>
+#include <gdk/gdk.h>
+
+PlacesHorizontalTile::PlacesHorizontalTile (const char *icon_name,
+                                            const char *label,
+                                            const char *comment,
+                                            int         icon_size,
+                                            bool defer_icon_loading,
+                                            const void *id)
+: PlacesTile (NUX_TRACKER_LOCATION, id),
+  _label (NULL),
+  _icon (NULL),
+  _uri (NULL)
+{
+  _label = g_strdup (label);
+  _icon = g_strdup (icon_name);
+  _comment = g_strdup_printf ("<small>%s</small>", comment);
+
+  int w = (PlacesSettings::GetDefault ()->GetDefaultTileWidth () * 2) - icon_size - 24;//padding
+
+  nux::HLayout *layout = new nux::HLayout ("", NUX_TRACKER_LOCATION);
+  layout->AddLayout (new nux::SpaceLayout (0, 0, 12, 12));
+
+  _icontex = new IconTexture (_icon, icon_size, defer_icon_loading);
+  _icontex->SetMinMaxSize (icon_size * 1.5, icon_size);
+  AddChild (_icontex);
+  layout->AddView (_icontex, 0, nux::eCenter, nux::eFull);
+
+  layout->AddLayout (new nux::SpaceLayout (0, 0, 12, 12));
+  
+  nux::VLayout *vlayout = new nux::VLayout ("", NUX_TRACKER_LOCATION);
+  layout->AddView (vlayout, 1, nux::eLeft, nux::eFull);
+
+  vlayout->AddLayout (new nux::SpaceLayout (0, 0, 6, 6));
+
+  _cairotext = new nux::StaticCairoText (_label);
+  _cairotext->SetTextAlignment (nux::StaticCairoText::NUX_ALIGN_LEFT);
+  _cairotext->SetMaximumWidth (w);
+  vlayout->AddView (_cairotext, 0, nux::eLeft, nux::eFull);
+
+  _cairotext = new nux::StaticCairoText (_comment);
+  _cairotext->SetTextEllipsize (nux::StaticCairoText::NUX_ELLIPSIZE_END);
+  _cairotext->SetTextAlignment (nux::StaticCairoText::NUX_ALIGN_LEFT);
+  _cairotext->SetLines (-3);
+  _cairotext->SetMaximumWidth (w);
+  _cairotext->SetTextColor (nux::Color (1.0f, 1.0f, 1.0f, 0.8f));
+  vlayout->AddView (_cairotext, 1, nux::eLeft, nux::eFull);
+
+  SetLayout (layout);
+  
+  SetDndEnabled (true, false);
+}
+
+
+PlacesHorizontalTile::~PlacesHorizontalTile ()
+{
+  g_free (_comment);
+  g_free (_label);
+  g_free (_icon);
+  g_free (_uri);
+}
+
+void
+PlacesHorizontalTile::DndSourceDragBegin ()
+{
+  Reference ();
+  ubus_server_send_message (ubus_server_get_default (),
+                            UBUS_PLACE_VIEW_CLOSE_REQUEST,
+                            NULL);
+}
+
+nux::NBitmapData * 
+PlacesHorizontalTile::DndSourceGetDragImage ()
+{
+  nux::NBitmapData *result = 0;
+  GdkPixbuf *pbuf;
+  GtkIconTheme *theme;
+  GtkIconInfo *info;
+  GError *error = NULL;
+  GIcon *icon;
+  
+  const char *icon_name = _icon;
+  int size = 64;
+  
+  if (!icon_name)
+    icon_name = "application-default-icon";
+   
+  theme = gtk_icon_theme_get_default ();
+  icon = g_icon_new_for_string (icon_name, NULL);
+
+  if (G_IS_ICON (icon))
+  {
+    info = gtk_icon_theme_lookup_by_gicon (theme, icon, size, (GtkIconLookupFlags)0);
+    g_object_unref (icon);
+  }
+  else
+  {   
+    info = gtk_icon_theme_lookup_icon (theme,
+                                       icon_name,
+                                       size,
+                                       (GtkIconLookupFlags) 0);
+  }
+
+  if (!info)
+  {
+    info = gtk_icon_theme_lookup_icon (theme,
+                                       "application-default-icon",
+                                       size,
+                                       (GtkIconLookupFlags) 0);
+  }
+        
+  if (gtk_icon_info_get_filename (info) == NULL)
+  {
+    gtk_icon_info_free (info);
+    info = gtk_icon_theme_lookup_icon (theme,
+                                       "application-default-icon",
+                                       size,
+                                       (GtkIconLookupFlags) 0);
+  }
+
+  pbuf = gtk_icon_info_load_icon (info, &error);
+  gtk_icon_info_free (info);
+
+  if (GDK_IS_PIXBUF (pbuf))
+  {
+    nux::GdkGraphics graphics (pbuf);
+    result = graphics.GetBitmap ();
+    g_object_unref (pbuf);
+  }
+  
+  return result;
+}
+
+std::list<const char *> 
+PlacesHorizontalTile::DndSourceGetDragTypes ()
+{
+  std::list<const char*> result;
+  result.push_back ("text/uri-list");
+  return result;
+}
+
+const char *
+PlacesHorizontalTile::DndSourceGetDataForType (const char *type, int *size, int *format)
+{
+  *format = 8;
+
+  if (_uri)
+  {
+    *size = strlen (_uri);
+    return _uri;
+  }
+  else
+  {
+    *size = 0;
+    return 0;
+  }
+}
+
+void
+PlacesHorizontalTile::DndSourceDragFinished (nux::DndAction result)
+{
+  UnReference ();
+}
+
+nux::Geometry
+PlacesHorizontalTile::GetHighlightGeometry ()
+{
+  nux::Geometry base = GetGeometry ();
+  int width = 0, height = 0;
+
+  _icontex->GetTextureSize (&width, &height);
+  
+  _highlight_geometry.x = 12;
+  _highlight_geometry.y = 12;
+  _highlight_geometry.width = width;
+  _highlight_geometry.height = height;
+
+  return _highlight_geometry;
+}
+
+void
+PlacesHorizontalTile::SetURI (const char *uri)
+{
+  if (_uri)
+    g_free (_uri);
+  
+  _uri = NULL;
+
+  if (uri)
+    _uri = g_strdup (uri);
+}
+
+const gchar*
+PlacesHorizontalTile::GetName ()
+{
+	return "PlacesHorizontalTile";
+}
+
+const gchar *
+PlacesHorizontalTile::GetChildsName ()
+{
+  return "PlacesHorizontalTileContents";
+}
+
+void
+PlacesHorizontalTile::AddProperties (GVariantBuilder *builder)
+{
+  nux::Geometry geo = GetGeometry ();
+
+  g_variant_builder_add (builder, "{sv}", "x", g_variant_new_int32 (geo.x));
+  g_variant_builder_add (builder, "{sv}", "y", g_variant_new_int32 (geo.y));
+  g_variant_builder_add (builder, "{sv}", "width", g_variant_new_int32 (geo.width));
+  g_variant_builder_add (builder, "{sv}", "height", g_variant_new_int32 (geo.height));
+}
 
=== added file 'src/PlacesHorizontalTile.h'
--- src/PlacesHorizontalTile.h	1970-01-01 00:00:00 +0000
+++ src/PlacesHorizontalTile.h	2011-03-31 19:28:30 +0000
@@ -0,0 +1,68 @@
+// -*- Mode: C++; indent-tabs-mode: nil; tab-width: 2 -*-
+/*
+ * Copyright (C) 2011 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Neil Jagdish Patel <[e-mail]>
+ */
+
+#ifndef PLACES_HORIZONTAL_TILE_H
+#define PLACES_HORIZONTAL_TILE_H
+
+#include <sigc++/sigc++.h>
+
+#include "IconTexture.h"
+#include "Introspectable.h"
+#include "PlacesTile.h"
+#include "StaticCairoText.h"
+
+class PlacesHorizontalTile : public Introspectable, public PlacesTile
+{
+public:
+
+  PlacesHorizontalTile (const char *icon,
+                        const char *label,
+                        const char *comment,
+                        int         icon_size=64,
+                        bool        defer_icon_loading=false,
+                        const void *id=NULL);
+  ~PlacesHorizontalTile ();
+
+  void SetURI (const char *uri);
+
+protected:
+  nux::Geometry GetHighlightGeometry ();
+
+  const gchar * GetName ();
+  const gchar * GetChildsName ();
+  void          AddProperties (GVariantBuilder *builder);
+  
+  virtual void                    DndSourceDragBegin      ();
+  virtual nux::NBitmapData *      DndSourceGetDragImage   ();
+  virtual std::list<const char *> DndSourceGetDragTypes   ();
+  virtual const char *            DndSourceGetDataForType (const char *type, int *size, int *format);
+  virtual void                    DndSourceDragFinished   (nux::DndAction result);
+
+private:
+  nux::Geometry _highlight_geometry;
+  char* _label;
+  char* _comment;
+  char* _icon;
+  char* _uri;
+  IconTexture *_icontex;
+  nux::StaticCairoText *_cairotext;
+};
+
+
+#endif /* PLACES_HORIZONTAL_TILE_H */
 
=== modified file 'src/PlacesSearchBar.cpp'
--- src/PlacesSearchBar.cpp	2011-03-29 15:24:56 +0000
+++ src/PlacesSearchBar.cpp	2011-03-31 19:28:30 +0000
@@ -103,6 +103,10 @@
   OnFontChanged (NULL, NULL, this);
 
   _cursor_moved_conn = _pango_entry->cursor_moved.connect (sigc::mem_fun (this, &PlacesSearchBar::OnLayeredLayoutQueueDraw));
+
+  ubus_server_register_interest (ubus_server_get_default (), UBUS_PLACE_VIEW_HIDDEN,
+                                 (UBusCallback)PlacesSearchBar::OnPlacesClosed, this);
+
 }
 
 PlacesSearchBar::~PlacesSearchBar ()
@@ -360,6 +364,12 @@
   g_free (font_desc);
 }
 
+void
+PlacesSearchBar::OnPlacesClosed (GVariant *variant, PlacesSearchBar *self)
+{
+  self->_combo->GetMenuPage ()->StopMenu ();
+}
+
 static void
 draw_rounded_rect (cairo_t* cr,
                    double   aspect,
 
=== modified file 'src/PlacesSearchBar.h'
--- src/PlacesSearchBar.h	2011-03-29 15:24:56 +0000
+++ src/PlacesSearchBar.h	2011-03-31 19:28:30 +0000
@@ -79,6 +79,7 @@
 
   static bool OnLiveSearchTimeout (PlacesSearchBar *self);
   static void OnFontChanged (GObject *object, GParamSpec *pspec, PlacesSearchBar *self);
+  static void OnPlacesClosed (GVariant *variant, PlacesSearchBar *self); 
 
 private:
   nux::AbstractPaintLayer *_bg_layer;
 
=== modified file 'src/PlacesView.cpp'
--- src/PlacesView.cpp	2011-03-24 01:47:55 +0000
+++ src/PlacesView.cpp	2011-03-31 19:28:30 +0000
@@ -179,6 +179,14 @@
   return ret;
 }
 
+static gboolean
+OnQueueDrawDrawDraw (PlacesView *self)
+{
+  self->QueueDraw ();
+
+  return FALSE;
+}
+
 void
 PlacesView::Draw (nux::GraphicsEngine& GfxContext, bool force_draw)
 {
@@ -232,6 +240,8 @@
       GfxContext.Push2DWindow (GfxContext.GetWindowWidth (), GfxContext.GetWindowHeight ());
       GfxContext.ApplyClippingRectangle ();
     }
+
+    g_timeout_add (0, (GSourceFunc)OnQueueDrawDrawDraw, this);
   }
 
   if (_bg_blur_texture.IsValid ()  && paint_blur)
 
=== modified file 'src/SimpleLauncherIcon.cpp'
--- src/SimpleLauncherIcon.cpp	2011-03-28 18:10:28 +0000
+++ src/SimpleLauncherIcon.cpp	2011-03-31 19:28:30 +0000
@@ -94,6 +94,7 @@
     
   if (m_Icon)
     m_Icon->UnReference ();
+  m_Icon = 0;
   
   if (!m_IconName)
     return 0;
@@ -139,6 +140,6 @@
   {
     self->m_Icon->UnReference ();
     self->m_Icon = 0;
+    self->needs_redraw.emit (self);
   }
-  self->needs_redraw.emit (self);
 }
 
=== modified file 'src/StaticCairoText.cpp'
--- src/StaticCairoText.cpp	2011-03-23 17:51:31 +0000
+++ src/StaticCairoText.cpp	2011-03-31 19:28:30 +0000
@@ -35,7 +35,8 @@
   View (NUX_FILE_LINE_PARAM),
   _fontstring (NULL),
   _cairoGraphics (NULL),
-  _texture2D (NULL)
+  _texture2D (NULL),
+  _lines (-2)
 
 {
   _textColor  = Color(1.0f, 1.0f, 1.0f, 1.0f);
@@ -88,6 +89,14 @@
   QueueDraw ();
 }
 
+void
+StaticCairoText::SetLines (int lines)
+{
+  _lines = lines;
+  UpdateTexture ();
+  QueueDraw ();
+}
+
 void StaticCairoText::PreLayoutManagement ()
 {
   int textWidth  = 0;
@@ -325,7 +334,7 @@
 
 
   pango_layout_set_markup (layout, _text.GetTCharPtr(), -1);
-  pango_layout_set_height (layout, -2);
+  pango_layout_set_height (layout, _lines);
   pango_layout_set_width (layout, maxwidth * PANGO_SCALE);
 
   pangoCtx = pango_layout_get_context (layout); // is not ref'ed
@@ -406,7 +415,7 @@
 
   pango_layout_set_markup (layout, _text.GetTCharPtr(), -1);
   pango_layout_set_width (layout, textWidth * PANGO_SCALE);
-  pango_layout_set_height (layout, -2);
+  pango_layout_set_height (layout, _lines);
   pangoCtx = pango_layout_get_context (layout); // is not ref'ed
   pango_cairo_context_set_font_options (pangoCtx,
                                         gdk_screen_get_font_options (screen));
 
=== modified file 'src/StaticCairoText.h'
--- src/StaticCairoText.h	2011-03-20 18:15:16 +0000
+++ src/StaticCairoText.h	2011-03-31 19:28:30 +0000
@@ -86,6 +86,7 @@
       void SetTextAlignment (AlignState state);
       void SetTextVerticalAlignment (AlignState state);
       void SetFont (const char *fontstring);
+      void SetLines (int lines);
 
       void GetTextExtents (int &width, int &height);
 
@@ -111,6 +112,8 @@
       int            _pre_layout_width;
       int            _pre_layout_height;
 
+      int            _lines;
+
       void GetTextExtents (const TCHAR* font,
                            int&         width,
                            int&         height);
 
=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2011-03-24 02:07:30 +0000
+++ tests/CMakeLists.txt	2011-03-31 19:28:30 +0000
@@ -140,6 +140,8 @@
                           ../src/PlacesStyle.h
                           ../src/PlacesTile.cpp
                           ../src/PlacesTile.h
+                          ../src/PlacesHorizontalTile.cpp
+                          ../src/PlacesHorizontalTile.h
                           ../src/PlacesSimpleTile.cpp
                           ../src/PlacesSimpleTile.h
                           ../src/TextureCache.h