spacing fixed

4 files changed, 5 insertions, 10 deletions

diff --git a/src/metadata-menu-item.vala b/src/metadata-menu-item.vala
index de02aec..dccf478 100644
--- a/src/metadata-menu-item.vala
+++ b/src/metadata-menu-item.vala
@@ -33,7 +33,6 @@ public class MetadataMenuitem : PlayerItem
   public MetadataMenuitem (PlayerController parent)
   {
     Object(item_type: MENUITEM_TYPE, owner: parent);
-    //reset(attributes_format());
   }
   
   construct{
@@ -45,6 +44,7 @@ public class MetadataMenuitem : PlayerItem
     this.property_set (MENUITEM_PLAYER_ICON, this.owner.icon_name);
     this.property_set_bool (MENUITEM_PLAYER_RUNNING, false);
     this.property_set_bool (MENUITEM_HIDE_TRACK_DETAILS, true);
+    reset (relevant_attributes_for_ui());
   }
 
   private static void clean_album_art_temp_dir()
diff --git a/src/metadata-widget.c b/src/metadata-widget.c
index c4e0974..9641406 100644
--- a/src/metadata-widget.c
+++ b/src/metadata-widget.c
@@ -183,7 +183,7 @@ metadata_widget_init (MetadataWidget *self)
   player_label = gtk_label_new("");
   gtk_misc_set_alignment(GTK_MISC(player_label), (gfloat)0, (gfloat)0);
   gtk_misc_set_padding (GTK_MISC(player_label), (gfloat)0, (gfloat)0);  
-  gtk_widget_set_size_request (player_label, 140, 20);
+  gtk_widget_set_size_request (player_label, 200, 25);
   priv->player_label = player_label;
   
   gtk_box_pack_start (GTK_BOX(outer_v_box), priv->player_label, FALSE, FALSE, 0);
@@ -511,7 +511,7 @@ metadata_widget_handle_resizing (MetadataWidget* self)
     gtk_widget_show (priv->album_art); 
     gtk_widget_show (priv->meta_data_v_box); 
 
-    gtk_widget_set_size_request(GTK_WIDGET(self), 200, 85);   
+    gtk_widget_set_size_request(GTK_WIDGET(self), 200, 95);   
     // This is not working!
     gtk_misc_set_alignment (GTK_MISC(gtk_image_menu_item_get_image (GTK_IMAGE_MENU_ITEM(self))),
                             0.5 /* right aligned */,
diff --git a/src/player-controller.vala b/src/player-controller.vala
index e8215cd..002af65 100644
--- a/src/player-controller.vala
+++ b/src/player-controller.vala
@@ -154,9 +154,7 @@ public class PlayerController : GLib.Object
                                                                    this.app_info.get_id() == "banshee.desktop");         
       return; 
     }
-    metadata_menuitem.should_collapse (false);
-    /*this.custom_items[widget_order.METADATA].property_set_bool (MENUITEM_PROP_VISIBLE,
-                                                                this.custom_items[widget_order.METADATA].populated(MetadataMenuitem.attributes_format()));*/
+    metadata_menuitem.should_collapse (!this.custom_items[widget_order.METADATA].populated (MetadataMenuitem.relevant_attributes_for_ui()) );
     if (this.app_info.get_id() == "banshee.desktop"){
       TransportMenuitem transport = this.custom_items[widget_order.TRANSPORT] as TransportMenuitem;
       transport.handle_cached_action();
diff --git a/src/player-item.vala b/src/player-item.vala
index f71b166..6d9c8e5 100644
--- a/src/player-item.vala
+++ b/src/player-item.vala
@@ -24,7 +24,7 @@ public class PlayerItem : Dbusmenu.Menuitem
 {
   public PlayerController owner {get; construct;}
   public string item_type { get; construct; }
-  private const int EMPTY = -1;
+  public const int EMPTY = -1;
 
   public PlayerItem(string type)
   {   
@@ -37,7 +37,6 @@ public class PlayerItem : Dbusmenu.Menuitem
 
   public void reset(HashSet<string> attrs){   
     foreach(string s in attrs){
-      //debug("attempting to set prop %s to EMPTY", s);
       this.property_set_int(s, EMPTY);
     }
   }
@@ -93,9 +92,7 @@ public class PlayerItem : Dbusmenu.Menuitem
   public bool populated(HashSet<string> attrs)
   {
     foreach(string prop in attrs){
-      //debug("populated ? - prop: %s", prop);
       if(property_get_int(prop) != EMPTY){
-        //debug("populated - prop %s and value %i", prop, property_get_int(prop));
         return true;
       }
     }