Merge lp:~gordallott/unity/fix-horizontal-renderer into lp:unity

[Gord Allott]

fixes the horizontal renderer, a method was not virtual when it should of been so the comment drawing code never got called.

also fixed a slight cutoff issue

=== modified file 'plugins/unityshell/src/PlacesStyle.cpp'
--- plugins/unityshell/src/PlacesStyle.cpp	2011-09-08 02:05:01 +0000
+++ plugins/unityshell/src/PlacesStyle.cpp	2011-09-13 17:11:25 +0000
@@ -96,7 +96,7 @@
 
 int PlacesStyle::GetTileIconSize() const
 {
-  return 48;
+  return 64;
 }
 
 int PlacesStyle::GetTileWidth() const
@@ -106,7 +106,7 @@
 
 int PlacesStyle::GetTileHeight() const
 {
-  return GetTileIconSize() + (_text_height * 4);
+  return GetTileIconSize() + (_text_height * 4) + 12;
 }
 
 int PlacesStyle::GetHomeTileIconSize() const

=== modified file 'plugins/unityshell/src/ResultRendererHorizontalTile.cpp'
--- plugins/unityshell/src/ResultRendererHorizontalTile.cpp	2011-09-05 00:46:13 +0000
+++ plugins/unityshell/src/ResultRendererHorizontalTile.cpp	2011-09-13 17:11:25 +0000
@@ -53,13 +53,14 @@
 {
   PlacesStyle* style = PlacesStyle::GetDefault();
   width = style->GetTileWidth() * 2;
-  height = style->GetTileIconSize() + 4;
+  height = style->GetTileIconSize() + (padding * 2);
 
   // pre-load the highlight texture
   // try and get a texture from the texture cache
   TextureCache& cache = TextureCache::GetDefault();
   prelight_cache_ = cache.FindTexture("ResultRendererHorizontalTile.PreLightTexture",
-                                      style->GetTileIconSize() + 8, style->GetTileIconSize() + 8,
+                                      style->GetTileIconSize() + (highlight_padding * 2),
+                                      style->GetTileIconSize() + (highlight_padding * 2),
                                       sigc::mem_fun(this, &ResultRendererHorizontalTile::DrawHighlight));
 }
 
@@ -73,6 +74,10 @@
                                 nux::Geometry& geometry,
                                 int x_offset, int y_offset)
 {
+  TextureContainer* container = row.renderer<TextureContainer*>();
+  if (container == nullptr)
+    return;
+
   std::string row_text = row.name;
   std::string row_iconhint = row.icon_hint;
   PlacesStyle* style = PlacesStyle::GetDefault();
@@ -97,14 +102,16 @@
                        geometry.height,
                        col);
 
-  TextureContainer *container = row.renderer<TextureContainer*>();
+  int icon_left_hand_side = geometry.x + padding;
+  int icon_top_side = geometry.y + ((geometry.height - style->GetTileIconSize()) / 2);
+
 
   if (container->blurred_icon)
   {
-    GfxContext.QRP_1Tex(geometry.x + 2 - x_offset,
-                        geometry.y + ((geometry.height - style->GetTileIconSize()) / 2 - y_offset),
-                        style->GetTileIconSize() + 4,
-                        style->GetTileIconSize() + 4,
+    GfxContext.QRP_1Tex(icon_left_hand_side - 5 - x_offset,
+                        icon_top_side - 5 - y_offset,
+                        style->GetTileIconSize() + 10,
+                        style->GetTileIconSize() + 10,
                         container->blurred_icon->GetDeviceTexture(),
                         texxform,
                         nux::Color(0.5f, 0.5f, 0.5f, 0.5f));
@@ -113,40 +120,38 @@
   // render highlight if its needed
   if (state != ResultRendererState::RESULT_RENDERER_NORMAL)
   {
-    GfxContext.QRP_1Tex(geometry.x,
-                        geometry.y + ((geometry.height - style->GetTileIconSize()) / 2) - 4,
-                        style->GetTileIconSize() + 8,
-                        style->GetTileIconSize() + 8,
+    GfxContext.QRP_1Tex(icon_left_hand_side - highlight_padding,
+                        icon_top_side - highlight_padding,
+                        style->GetTileIconSize() + (highlight_padding * 2),
+                        style->GetTileIconSize() + (highlight_padding * 2),
                         prelight_cache_->GetDeviceTexture(),
                         texxform,
                         nux::Color(1.0f, 1.0f, 1.0f, 1.0f));
   }
 
-
+  // draw the icon
+  if (container->icon)
+  {
+    GfxContext.QRP_1Tex(icon_left_hand_side,
+                        icon_top_side,
+                        style->GetTileIconSize(),
+                        style->GetTileIconSize(),
+                        container->icon->GetDeviceTexture(),
+                        texxform,
+                        nux::Color(1.0f, 1.0f, 1.0f, 1.0f));
+  }
 
   if (container->text)
   {
-    GfxContext.QRP_1Tex(geometry.x + style->GetTileIconSize() + 6,
-                        geometry.y + 2,
+    GfxContext.QRP_1Tex(icon_left_hand_side + style->GetTileIconSize() + spacing,
+                        icon_top_side,
                         width() - style->GetTileIconSize(),
-                        style->GetTileIconSize() - 4,
+                        height() - (padding * 2),
                         container->text->GetDeviceTexture(),
                         texxform,
                         nux::Color(1.0f, 1.0f, 1.0f, 1.0f));
   }
 
-  // draw the icon
-  if (container->icon)
-  {
-    GfxContext.QRP_1Tex(geometry.x + 4,
-                        geometry.y + ((geometry.height - style->GetTileIconSize()) / 2),
-                        style->GetTileIconSize(),
-                        style->GetTileIconSize(),
-                        container->icon->GetDeviceTexture(),
-                        texxform,
-                        nux::Color(1.0f, 1.0f, 1.0f, 1.0f));
-  }
-
   GfxContext.GetRenderStates().SetBlend(alpha, src, dest);
 
 }
@@ -224,8 +229,8 @@
 
   PlacesStyle*          style      = PlacesStyle::GetDefault();
   nux::CairoGraphics _cairoGraphics(CAIRO_FORMAT_ARGB32,
-                                    width() - style->GetTileIconSize(),
-                                    height() - 4);
+                                    width() - style->GetTileIconSize() + spacing,
+                                    height() - (padding * 2));
 
   cairo_t* cr = _cairoGraphics.GetContext();
 
@@ -248,8 +253,8 @@
 
   pango_layout_set_wrap(layout, PANGO_WRAP_WORD_CHAR);
   pango_layout_set_ellipsize(layout, PANGO_ELLIPSIZE_END);
-  pango_layout_set_width(layout, (width() - style->GetTileIconSize())* PANGO_SCALE);
-  pango_layout_set_height(layout, (height() - 4) * PANGO_SCALE);
+  pango_layout_set_width(layout, (width() - style->GetTileIconSize() - spacing)* PANGO_SCALE);
+  pango_layout_set_height(layout, (height() - (padding * 2)) * PANGO_SCALE);
 
   pango_layout_set_markup(layout, final_text.str().c_str(), -1);
 

=== modified file 'plugins/unityshell/src/ResultRendererHorizontalTile.h'
--- plugins/unityshell/src/ResultRendererHorizontalTile.h	2011-09-06 18:30:26 +0000
+++ plugins/unityshell/src/ResultRendererHorizontalTile.h	2011-09-13 17:11:25 +0000
@@ -54,7 +54,7 @@
                       int x_offset, int y_offset);
 
 protected:
-  void LoadText(Result& row);
+  virtual void LoadText(Result& row);
 
 private:
   nux::BaseTexture* DrawHighlight(std::string const& texid,

=== modified file 'plugins/unityshell/src/ResultRendererTile.cpp'
--- plugins/unityshell/src/ResultRendererTile.cpp	2011-09-08 09:32:32 +0000
+++ plugins/unityshell/src/ResultRendererTile.cpp	2011-09-13 17:11:25 +0000
@@ -44,6 +44,11 @@
 //~ nux::logging::Logger logger("unity.dash.ResultRendererTile");
 //~ }
 
+namespace
+{
+  bool neko;
+}
+
 namespace unity
 {
 namespace dash
@@ -52,16 +57,25 @@
 
 ResultRendererTile::ResultRendererTile(NUX_FILE_LINE_DECL)
   : ResultRenderer(NUX_FILE_LINE_PARAM)
+  , highlight_padding(6)
+  , spacing(12)
+  , padding(6)
 {
   PlacesStyle* style = PlacesStyle::GetDefault();
   width = style->GetTileWidth();
-  height = style->GetTileHeight();;
+  height = style->GetTileHeight();
+
+  gsize tmp;
+  gchar* tmp1 = (gchar*)g_base64_decode("VU5JVFlfTkVLTw==", &tmp);
+  neko = (g_getenv(tmp1));
+  g_free (tmp1);
 
   // pre-load the highlight texture
   // try and get a texture from the texture cache
   TextureCache& cache = TextureCache::GetDefault();
   prelight_cache_ = cache.FindTexture("ResultRendererTile.PreLightTexture",
-                                      62, 62,
+                                      style->GetTileIconSize() + (highlight_padding * 2),
+                                      style->GetTileIconSize() + (highlight_padding * 2),
                                       sigc::mem_fun(this, &ResultRendererTile::DrawHighlight));
 }
 
@@ -103,12 +117,16 @@
                        geometry.height,
                        col);
 
+  int icon_left_hand_side = geometry.x + (geometry.width - style->GetTileIconSize()) / 2;
+  int icon_top_side = geometry.y + padding;
+
+
   if (container->blurred_icon)
   {
-    GfxContext.QRP_1Tex(geometry.x + ((geometry.width - 58) / 2) - x_offset,
-                        geometry.y + 1 - y_offset,
-                        58,
-                        58,
+    GfxContext.QRP_1Tex(icon_left_hand_side - 5 - x_offset,
+                        icon_top_side - 5 - y_offset,
+                        style->GetTileIconSize() + 10,
+                        style->GetTileIconSize() + 10,
                         container->blurred_icon->GetDeviceTexture(),
                         texxform,
                         nux::Color(0.5f, 0.5f, 0.5f, 0.5f));
@@ -117,40 +135,40 @@
   // render highlight if its needed
   if (state != ResultRendererState::RESULT_RENDERER_NORMAL)
   {
-    GfxContext.QRP_1Tex(geometry.x + ((geometry.width - 62) / 2),
-                        geometry.y + 2,
-                        62,
-                        62,
+    GfxContext.QRP_1Tex(icon_left_hand_side - highlight_padding,
+                        icon_top_side - highlight_padding,
+                        style->GetTileIconSize() + (highlight_padding * 2),
+                        style->GetTileIconSize() + (highlight_padding * 2),
                         prelight_cache_->GetDeviceTexture(),
                         texxform,
                         nux::Color(1.0f, 1.0f, 1.0f, 1.0f));
   }
 
-  if (container->text)
-  {
-    GfxContext.QRP_1Tex(geometry.x + 6,
-                        geometry.y + style->GetTileIconSize() + 14,
-                        style->GetTileWidth() - 12,
-                        style->GetTileHeight() - style->GetTileIconSize() - 12,
-                        container->text->GetDeviceTexture(),
-                        texxform,
-                        nux::Color(1.0f, 1.0f, 1.0f, 1.0f));
-
-
-  }
-
   // draw the icon
   if (container->icon)
   {
-    GfxContext.QRP_1Tex(geometry.x + ((geometry.width - 48) / 2),
-                        geometry.y + 9,
-                        48,
-                        48,
+    GfxContext.QRP_1Tex(icon_left_hand_side,
+                        icon_top_side,
+                        style->GetTileIconSize(),
+                        style->GetTileIconSize(),
                         container->icon->GetDeviceTexture(),
                         texxform,
                         nux::Color(1.0f, 1.0f, 1.0f, 1.0f));
   }
 
+  if (container->text)
+  {
+    GfxContext.QRP_1Tex(geometry.x + padding,
+                        geometry.y + style->GetTileIconSize() + spacing,
+                        style->GetTileWidth() - (padding * 2),
+                        style->GetTileHeight() - style->GetTileIconSize() - spacing,
+                        container->text->GetDeviceTexture(),
+                        texxform,
+                        nux::Color(1.0f, 1.0f, 1.0f, 1.0f));
+
+
+  }
+
   GfxContext.GetRenderStates().SetBlend(alpha, src, dest);
 
 }
@@ -240,43 +258,52 @@
 
 void ResultRendererTile::LoadIcon(Result& row)
 {
+  PlacesStyle* style = PlacesStyle::GetDefault();
   std::string const& icon_hint = row.icon_hint;
 #define DEFAULT_GICON ". GThemedIcon text-x-preview"
   std::string icon_name;
-  gsize tmp4;
-  gchar* tmp5 = (gchar*)g_base64_decode("VU5JVFlfTkVLTw==", &tmp4);
-  if (g_getenv(tmp5))
+  if (neko)
   {
-    int tmp1 = 48 + (rand() % 16) - 8;
+    int tmp1 = style->GetTileIconSize() + (rand() % 16) - 8;
     gsize tmp3;
     gchar* tmp2 = (gchar*)g_base64_decode("aHR0cDovL3BsYWNla2l0dGVuLmNvbS8laS8laS8=", &tmp3);
-    // FIXME: this leaks
-    icon_name = g_strdup_printf(tmp2, tmp1, tmp1);
+    gchar* tmp4 = g_strdup_printf(tmp2, tmp1, tmp1);
+    icon_name = tmp4;
+    g_free(tmp4);
     g_free(tmp2);
   }
   else
   {
     icon_name = !icon_hint.empty() ? icon_hint : DEFAULT_GICON;
   }
-  g_free(tmp5);
+
+  if (g_str_has_prefix(icon_name.c_str(), "/"))
+  {
+    // absolute filename, check to see if it exists first
+    glib::Object<GFile> file(g_file_new_for_path(icon_name.c_str()));
+    if (g_file_query_exists(file, NULL) == false)
+    {
+      icon_name = DEFAULT_GICON;
+    }
+  }
 
   GIcon*  icon = g_icon_new_for_string(icon_name.c_str(), NULL);
   TextureContainer* container = row.renderer<TextureContainer*>();
 
   IconLoader::IconLoaderCallback slot = sigc::bind(sigc::mem_fun(this, &ResultRendererTile::IconLoaded), icon_hint, row);
 
-  if (g_str_has_prefix(icon_name.c_str(), "http://"))
+  if (g_strrstr(icon_name.c_str(), "://"))
   {
-    container->slot_handle = IconLoader::GetDefault().LoadFromURI(icon_name.c_str(), 48, slot);
+    container->slot_handle = IconLoader::GetDefault().LoadFromURI(icon_name.c_str(), style->GetTileIconSize(), slot);
   }
   else if (G_IS_ICON(icon))
   {
-    container->slot_handle = IconLoader::GetDefault().LoadFromGIconString(icon_name.c_str(), 48, slot);
+    container->slot_handle = IconLoader::GetDefault().LoadFromGIconString(icon_name.c_str(), style->GetTileIconSize(), slot);
     g_object_unref(icon);
   }
   else
   {
-    container->slot_handle = IconLoader::GetDefault().LoadFromIconName(icon_name.c_str(), 48, slot);
+    container->slot_handle = IconLoader::GetDefault().LoadFromIconName(icon_name.c_str(), style->GetTileIconSize(), slot);
   }
 }
 
@@ -321,13 +348,17 @@
                                     Result& row)
 {
   TextureContainer *container = row.renderer<TextureContainer*>();
+  PlacesStyle* style = PlacesStyle::GetDefault();
+
   if (pixbuf && container)
   {
     TextureCache& cache = TextureCache::GetDefault();
-    BaseTexturePtr texture(cache.FindTexture(icon_name, 48, 48, sigc::bind(sigc::mem_fun(this, &ResultRendererTile::CreateTextureCallback), pixbuf)));
+    BaseTexturePtr texture(cache.FindTexture(icon_name, style->GetTileIconSize(), style->GetTileIconSize(),
+                           sigc::bind(sigc::mem_fun(this, &ResultRendererTile::CreateTextureCallback), pixbuf)));
 
     std::string blur_texid = icon_name + "_blurred";
-    BaseTexturePtr texture_blurred(cache.FindTexture(blur_texid, 48, 48, sigc::bind(sigc::mem_fun(this, &ResultRendererTile::CreateBlurredTextureCallback), pixbuf)));
+    BaseTexturePtr texture_blurred(cache.FindTexture(blur_texid, style->GetTileIconSize(), style->GetTileIconSize(),
+                                   sigc::bind(sigc::mem_fun(this, &ResultRendererTile::CreateBlurredTextureCallback), pixbuf)));
 
     container->icon = texture;
     container->blurred_icon = texture_blurred;
@@ -344,8 +375,8 @@
 {
   PlacesStyle*          style      = PlacesStyle::GetDefault();
   nux::CairoGraphics _cairoGraphics(CAIRO_FORMAT_ARGB32,
-                                    style->GetTileWidth(),
-                                    style->GetTileHeight() - style->GetTileIconSize() - 12);
+                                    style->GetTileWidth() - (padding * 2),
+                                    style->GetTileHeight() - style->GetTileIconSize() - spacing);
 
   cairo_t* cr = _cairoGraphics.GetContext();
 
@@ -368,7 +399,7 @@
 
   pango_layout_set_wrap(layout, PANGO_WRAP_WORD_CHAR);
   pango_layout_set_ellipsize(layout, PANGO_ELLIPSIZE_START);
-  pango_layout_set_width(layout, (style->GetTileWidth() - 12)* PANGO_SCALE);
+  pango_layout_set_width(layout, (style->GetTileWidth() - (padding * 2))* PANGO_SCALE);
   pango_layout_set_height(layout, -2);
 
   pango_layout_set_markup(layout, row.name().c_str(), -1);

=== modified file 'plugins/unityshell/src/ResultRendererTile.h'
--- plugins/unityshell/src/ResultRendererTile.h	2011-09-06 18:30:26 +0000
+++ plugins/unityshell/src/ResultRendererTile.h	2011-09-13 17:11:25 +0000
@@ -79,8 +79,12 @@
   // unload any previous grabbed images
   virtual void Unload(Result& row);
 
+  int highlight_padding;
+  int spacing;
+  int padding;
+
 protected:
-  void LoadText(Result& row);
+  virtual void LoadText(Result& row);
   void LoadIcon(Result& row);
   nux::ObjectPtr<nux::BaseTexture> prelight_cache_;
 

=== modified file 'plugins/unityshell/src/ResultViewGrid.cpp'
--- plugins/unityshell/src/ResultViewGrid.cpp	2011-09-08 19:14:49 +0000
+++ plugins/unityshell/src/ResultViewGrid.cpp	2011-09-13 17:11:25 +0000
@@ -45,8 +45,8 @@
 
 ResultViewGrid::ResultViewGrid(NUX_FILE_LINE_DECL)
   : ResultView(NUX_FILE_LINE_PARAM)
-  , horizontal_spacing(6)
-  , vertical_spacing(6)
+  , horizontal_spacing(0)
+  , vertical_spacing(0)
   , padding(6)
   , mouse_over_index_(-1)
   , active_index_(-1)
@@ -691,7 +691,7 @@
 }
 
 GdkPixbuf *
-_icon_hint_get_drag_pixbuf (std::string icon_hint) 
+_icon_hint_get_drag_pixbuf (std::string icon_hint)
 {
   GdkPixbuf *pbuf;
   GtkIconTheme *theme;
@@ -699,16 +699,16 @@
   GError *error = NULL;
   GIcon *icon;
   int size = 64;
-  
+
   if (icon_hint.empty())
     icon_hint = "application-default-icon";
-  
+
   if (g_str_has_prefix(icon_hint.c_str(), "/"))
   {
 
-    pbuf = gdk_pixbuf_new_from_file_at_scale (icon_hint.c_str(), 
+    pbuf = gdk_pixbuf_new_from_file_at_scale (icon_hint.c_str(),
                                               size, -1, TRUE, &error);
-    
+
     if (error != NULL || !pbuf || !GDK_IS_PIXBUF (pbuf))
     {
       icon_hint = "application-default-icon";
@@ -720,7 +720,7 @@
   }
   theme = gtk_icon_theme_get_default();
   icon = g_icon_new_for_string(icon_hint.c_str(), NULL);
-  
+
   if (G_IS_ICON(icon))
   {
      info = gtk_icon_theme_lookup_by_gicon(theme, icon, size, (GtkIconLookupFlags)0);
@@ -733,7 +733,7 @@
                                         size,
                                         (GtkIconLookupFlags) 0);
   }
-  
+
   if (!info)
   {
       info = gtk_icon_theme_lookup_icon(theme,
@@ -741,7 +741,7 @@
                                         size,
                                         (GtkIconLookupFlags) 0);
   }
-  
+
   if (gtk_icon_info_get_filename(info) == NULL)
   {
       gtk_icon_info_free(info);
@@ -750,21 +750,21 @@
                                         size,
                                         (GtkIconLookupFlags) 0);
   }
-  
+
   pbuf = gtk_icon_info_load_icon(info, &error);
-  
-  
+
+
   if (error != NULL)
   {
     LOG_WARN (logger) << "could not find a pixbuf for " << icon_hint;
     g_error_free (error);
     pbuf = NULL;
   }
-  
+
   gtk_icon_info_free(info);
-  
+
   return pbuf;
-  
+
 }
 
 nux::NBitmapData*
@@ -772,7 +772,7 @@
 {
   nux::NBitmapData* result = 0;
   GdkPixbuf* pbuf;
-  
+
   pbuf = _icon_hint_get_drag_pixbuf (current_drag_icon_name_);
 
   if (pbuf && GDK_IS_PIXBUF(pbuf))