Merge lp:~malizor/indicator-sound/fix-654196 into lp:~indicator-applet-developers/indicator-sound/trunk_3

[Nicolas Delvaux]

This fixes bug 654196, where the sound menu didn't keep the original album art ratio.
Of course, to test (and to notice the difference) you will have to use an album cover with a non-standard size/ratio :-)

[lp:~malizor/indicator-sound/fix-654196]

239. By Nicolas Delvaux on 2011-04-16

Fix a regression when calling "draw_album_art_placeholder" after diplaying one of those famous non-square cover.

[Conor Curran (cjcurran)]

Tentatively looks good, much tidier than my attempt :)
Will test tomorrow hopefully and get into Natty for next week.

[Conor Curran (cjcurran)]

review: Approve

[Nicolas Delvaux (malizor)]

To be honest, I noticed that this only fix half of the original bug.

The case when the cover is "taller than wide" works (ie the display box now adapt its width) but, for an unknown reason, it does not work the other way around: I tried several things but the height seems to be fixed.

Well, this is still better with this patch than without it, but it would be cool if someone could find where the remaining problem is.

[Charles Kerr (charlesk)]

This appears to be a dead merge proposal that never got closed... marking as "merged"

=== modified file 'src/metadata-widget.c'
--- src/metadata-widget.c	2011-01-27 03:30:55 +0000
+++ src/metadata-widget.c	2011-04-16 18:22:25 +0000
@@ -106,8 +106,7 @@
   
   g_signal_connect(priv->album_art, "expose-event", 
                    G_CALLBACK(metadata_image_expose),
-                   GTK_WIDGET(self));   
-  gtk_widget_set_size_request(GTK_WIDGET(priv->album_art), 60, 60); 
+                   GTK_WIDGET(self));
   
   gtk_box_pack_start (GTK_BOX (priv->hbox),
                       priv->album_art,
@@ -190,26 +189,29 @@
     if(g_string_equal(priv->image_path, priv->old_image_path) == FALSE ||
        priv->theme_change_occured == TRUE){
       priv->theme_change_occured = FALSE;         
-      GdkPixbuf* orig_pixbuf;
-      orig_pixbuf = gdk_pixbuf_new_from_file(priv->image_path->str, NULL);
+      GdkPixbuf* pixbuf;
+      pixbuf = gdk_pixbuf_new_from_file_at_size(priv->image_path->str, 60, 60, NULL);
       //g_debug("metadata_load_new_image -> pixbuf from %s",
       //        priv->image_path->str); 
-      if(GDK_IS_PIXBUF(orig_pixbuf) == FALSE){
+      if(GDK_IS_PIXBUF(pixbuf) == FALSE){
         //g_debug("problem loading the downloaded image just use the placeholder instead");
+        gtk_widget_set_size_request(GTK_WIDGET(priv->album_art), 60, 60);
         draw_album_art_placeholder(metadata);
         return TRUE;
       }
-      GdkPixbuf* pixbuf;         
-      pixbuf = gdk_pixbuf_scale_simple(orig_pixbuf,60, 60, GDK_INTERP_BILINEAR);
       gtk_image_set_from_pixbuf(GTK_IMAGE(priv->album_art), pixbuf);
+      gtk_widget_set_size_request(GTK_WIDGET(priv->album_art),
+                                  gdk_pixbuf_get_width(pixbuf),
+                                  gdk_pixbuf_get_height(pixbuf));
+
       g_string_erase(priv->old_image_path, 0, -1);
       g_string_overwrite(priv->old_image_path, 0, priv->image_path->str);
 
-      g_object_unref(pixbuf);       
-      g_object_unref(orig_pixbuf);       
+      g_object_unref(pixbuf);
     }
     return FALSE;       
   }
+  gtk_widget_set_size_request(GTK_WIDGET(priv->album_art), 60, 60);
   draw_album_art_placeholder(metadata);
   return TRUE;
 }