[Goodies-commits] r2679 - xfce4-quicklauncher-plugin/trunk/panel-plugin

[Masse Nicolas]

Author: bountykiller
Date: 2007-04-07 11:56:44 +0000 (Sat, 07 Apr 2007)
New Revision: 2679

Modified:
   xfce4-quicklauncher-plugin/trunk/panel-plugin/main.c
Log:
+ fix a problem with labels

Modified: xfce4-quicklauncher-plugin/trunk/panel-plugin/main.c
===================================================================
--- xfce4-quicklauncher-plugin/trunk/panel-plugin/main.c	2007-04-07 06:26:16 UTC (rev 2678)
+++ xfce4-quicklauncher-plugin/trunk/panel-plugin/main.c	2007-04-07 11:56:44 UTC (rev 2679)
@@ -485,10 +485,7 @@
 	launcher->def_img = _create_pixbuf(launcher->icon_id, launcher->icon_name, size);
 	if (launcher->def_img)
 		gtk_image_set_from_pixbuf(GTK_IMAGE(launcher->image), launcher->def_img);
-	if(!launcher->quicklauncher->has_labels)
-		gtk_widget_set_size_request(launcher->box, size, size);
-	else
-		gtk_widget_set_size_request(launcher->box, -1, size); 
+	gtk_widget_set_size_request(launcher->box, launcher->quicklauncher->has_labels?-1:size, size); 
 }
 
 void
@@ -522,9 +519,14 @@
 		launcher->label = gtk_label_new(launcher->command);
 		gtk_box_pack_end(GTK_BOX(launcher->hbox), launcher->label, FALSE, FALSE, 0);
 		gtk_widget_show(launcher->label);
+		gtk_widget_set_size_request(launcher->box, -1, launcher->quicklauncher->icon_size); 
 	}
 	else
+	{
 		launcher->label = NULL;
+		gtk_widget_set_size_request(launcher->box, launcher->quicklauncher->icon_size, 
+									launcher->quicklauncher->icon_size);
+	}
 }
 
 void create_launcher(t_launcher	*launcher)