Merge lp:~robertcarr/unity/result-dragimages into lp:unity

[Robert Carr]

Make use of the icon_hint from lenses when making a drag image. Currently we assume it is also a name, but it could be a path to a thumbnail. This ensures the drag image will be the same as the image displayed in the dash.

In a lot of cases this will fail without:
https://code.launchpad.net/~robertcarr/nux/dnd-imageformat/+merge/74667

[Gord Allott (gordallott)]

review: Approve

=== modified file 'plugins/unityshell/src/ResultViewGrid.cpp'
--- plugins/unityshell/src/ResultViewGrid.cpp	2011-09-08 11:08:57 +0000
+++ plugins/unityshell/src/ResultViewGrid.cpp	2011-09-08 19:17:25 +0000
@@ -690,66 +690,92 @@
   return true;
 }
 
-nux::NBitmapData*
-ResultViewGrid::DndSourceGetDragImage()
+GdkPixbuf *
+_icon_hint_get_drag_pixbuf (std::string icon_hint) 
 {
-  nux::NBitmapData* result = 0;
-  GdkPixbuf* pbuf;
-  GtkIconTheme* theme;
-  GtkIconInfo* info;
-  GError* error = NULL;
-  GIcon* icon;
-
-  std::string icon_name = current_drag_icon_name_.c_str();
+  GdkPixbuf *pbuf;
+  GtkIconTheme *theme;
+  GtkIconInfo *info;
+  GError *error = NULL;
+  GIcon *icon;
   int size = 64;
-
-  if (icon_name.empty())
-    icon_name = "application-default-icon";
-
+  
+  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(), 
+                                              size, -1, TRUE, &error);
+    
+    if (error != NULL || !pbuf || !GDK_IS_PIXBUF (pbuf))
+    {
+      icon_hint = "application-default-icon";
+      g_error_free (error);
+      error = NULL;
+    }
+    else
+      return pbuf;
+  }
   theme = gtk_icon_theme_get_default();
-  icon = g_icon_new_for_string(icon_name.c_str(), NULL);
-
+  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);
-    g_object_unref(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.c_str(),
-                                      size,
-                                      (GtkIconLookupFlags) 0);
+     info = gtk_icon_theme_lookup_icon(theme,
+                                        icon_hint.c_str(),
+                                        size,
+                                        (GtkIconLookupFlags) 0);
   }
-
+  
   if (!info)
   {
-    info = gtk_icon_theme_lookup_icon(theme,
-                                      "application-default-icon",
-                                      size,
-                                      (GtkIconLookupFlags) 0);
+      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);
+      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);
+  
+  
   if (error != NULL)
   {
-    LOG_WARN (logger) << "could not find a pixbuf for " << icon_name;
+    LOG_WARN (logger) << "could not find a pixbuf for " << icon_hint;
     g_error_free (error);
-    result = NULL;
+    pbuf = NULL;
   }
-
+  
   gtk_icon_info_free(info);
-
-  if (GDK_IS_PIXBUF(pbuf))
+  
+  return pbuf;
+  
+}
+
+nux::NBitmapData*
+ResultViewGrid::DndSourceGetDragImage()
+{
+  nux::NBitmapData* result = 0;
+  GdkPixbuf* pbuf;
+  
+  pbuf = _icon_hint_get_drag_pixbuf (current_drag_icon_name_);
+
+  if (pbuf && GDK_IS_PIXBUF(pbuf))
   {
     // we don't free the pbuf as GdkGraphics will do it for us will do it for us
     nux::GdkGraphics graphics(pbuf);