From a00800c33fac8ec7daa30ffd55c70e29017968bd Mon Sep 17 00:00:00 2001 From: Harald Judt Date: Thu, 24 May 2012 02:34:55 +0200 Subject: Minimize space wasted by label borders. A border of 4px wastes too much space, so use only 2px. Further, we do not need to set a border on the title label if send and receive labels are displayed, as they have their own border. --- panel-plugin/netload.c | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/panel-plugin/netload.c b/panel-plugin/netload.c index 5152acb..7cef218 100644 --- a/panel-plugin/netload.c +++ b/panel-plugin/netload.c @@ -35,6 +35,7 @@ #define BORDER 8 +#define LABEL_BORDER 2 #define PROGRESS_BAR_SIZE 8 /* Defaults */ @@ -407,7 +408,7 @@ static t_global_monitor * monitor_new(XfcePanelPlugin *plugin) global->monitor->label = gtk_label_new(global->monitor->options.label_text); gtk_box_pack_start(GTK_BOX(global->monitor->box), GTK_WIDGET(global->monitor->label), - TRUE, FALSE, BORDER / 2); + TRUE, FALSE, LABEL_BORDER); /* Create sent and received labels */ global->monitor->rcv_label = gtk_label_new("-"); @@ -416,7 +417,7 @@ static t_global_monitor * monitor_new(XfcePanelPlugin *plugin) gtk_label_set_width_chars(GTK_LABEL(global->monitor->sent_label), 7); gtk_box_pack_start(GTK_BOX(global->monitor->box), GTK_WIDGET(global->monitor->rcv_label), - TRUE, FALSE, BORDER / 2); + TRUE, FALSE, LABEL_BORDER); gtk_misc_set_alignment(GTK_MISC(global->monitor->rcv_label), 1.0f, 0.5f); gtk_misc_set_alignment(GTK_MISC(global->monitor->sent_label), 0.0f, 0.5f); @@ -446,7 +447,7 @@ static t_global_monitor * monitor_new(XfcePanelPlugin *plugin) /* Append sent label after the progress bars */ gtk_box_pack_start(GTK_BOX(global->monitor->box), GTK_WIDGET(global->monitor->sent_label), - TRUE, FALSE, BORDER / 2); + TRUE, FALSE, LABEL_BORDER); gtk_container_add(GTK_CONTAINER(global->ebox), GTK_WIDGET(global->box)); @@ -476,11 +477,17 @@ static void setup_monitor(t_global_monitor *global, gboolean supress_warnings) { gtk_widget_show(global->monitor->rcv_label); gtk_widget_show(global->monitor->sent_label); + gtk_box_set_child_packing(GTK_BOX(global->monitor->box), + GTK_WIDGET(global->monitor->label), + TRUE, FALSE, 0, GTK_PACK_START); } else { gtk_widget_hide(global->monitor->rcv_label); gtk_widget_hide(global->monitor->sent_label); + gtk_box_set_child_packing(GTK_BOX(global->monitor->box), + GTK_WIDGET(global->monitor->label), + TRUE, FALSE, LABEL_BORDER, GTK_PACK_START); } if (global->monitor->options.colorize_values) -- 1.7.8.6