Mercurial > pidgin

changeset 14546:776975f2c550

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 17269] Cleanup the spacing down in the statusbox area committer: Tailor Script <tailor@pidgin.im>
author Sean Egan <seanegan@gmail.com>
date Wed, 13 Sep 2006 22:10:19 +0000
parents 0a7ce7c8faa8
children 761f6ab6f253
files gtk/gtkblist.c gtk/gtkstatusbox.c
diffstat 2 files changed, 20 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/gtk/gtkblist.c	Wed Sep 13 18:02:08 2006 +0000
+++ b/gtk/gtkblist.c	Wed Sep 13 22:10:19 2006 +0000
@@ -3864,6 +3864,7 @@
 	GtkTreeViewColumn *column;
 	GtkWidget *menu;
 	GtkWidget *sw;
+	GtkWidget *sep;
 	GtkAccelGroup *accel_group;
 	GtkTreeSelection *selection;
 	GtkTargetEntry dte[] = {{"GAIM_BLIST_NODE", GTK_TARGET_SAME_APP, DRAG_ROW},
@@ -4042,6 +4043,9 @@
 	gtk_box_pack_start(GTK_BOX(gtkblist->vbox), sw, TRUE, TRUE, 0);
 	gtk_container_add(GTK_CONTAINER(sw), gtkblist->treeview);
 
+	sep = gtk_hseparator_new();
+	gtk_box_pack_start(GTK_BOX(gtkblist->vbox), sep, FALSE, FALSE, 0);
+	
 	/* Create an empty vbox used for showing connection errors */
 	gtkblist->error_buttons = gtk_vbox_new(FALSE, 0);
 	gtk_box_pack_start(GTK_BOX(gtkblist->vbox), gtkblist->error_buttons, FALSE, FALSE, 0);
@@ -4050,6 +4054,7 @@
 	gtkblist->statusbox = gtk_gaim_status_box_new();
 	gtk_box_pack_start(GTK_BOX(gtkblist->vbox), gtkblist->statusbox, FALSE, TRUE, 0);
 	gtk_widget_set_name(gtkblist->statusbox, "gaim_gtkblist_statusbox");
+	gtk_container_set_border_width(GTK_CONTAINER(gtkblist->statusbox), 3);
 	gtk_widget_show(gtkblist->statusbox);
 
 	/* set the Show Offline Buddies option. must be done
--- a/gtk/gtkstatusbox.c	Wed Sep 13 18:02:08 2006 +0000
+++ b/gtk/gtkstatusbox.c	Wed Sep 13 22:10:19 2006 +0000
@@ -1252,27 +1252,33 @@
 	GtkRequisition req = {0,0};
 	GtkAllocation parent_alc, box_alc, icon_alc;
 	GdkPixbuf *scaled;
+	gint border_width = GTK_CONTAINER (widget)->border_width;
 
 	combo_box_size_request(widget, &req);
 
 	box_alc = *allocation;
-	box_alc.height = MAX(1, (allocation->height - req.height - 6));
-	box_alc.y += req.height + 6;
+	
+	box_alc.width -= (border_width * 2);
+	box_alc.height = MAX(1, ((allocation->height - req.height) - (border_width*2)));
+	box_alc.x += border_width;
+	box_alc.y += req.height + border_width;
 	gtk_widget_size_allocate((GTK_GAIM_STATUS_BOX(widget))->vbox, &box_alc);
 
 	parent_alc = *allocation;
-	parent_alc.height = MAX(1,req.height);
-	parent_alc.y += 3;
+	parent_alc.height = MAX(1,req.height - (border_width ));
+	parent_alc.width -= (border_width * 2);
+	parent_alc.x += border_width;
+	parent_alc.y += border_width;
 
 	if (status_box->icon_box)
 	{
-		parent_alc.width -= (parent_alc.height + 3);
+		parent_alc.width -= (parent_alc.height + border_width);
 		icon_alc = *allocation;
-		icon_alc.height = MAX(1,req.height);
+		icon_alc.height = MAX(1,req.height) - (border_width);
 		icon_alc.width = icon_alc.height;
-		icon_alc.x = allocation->width - icon_alc.width;
-		icon_alc.y += 3;
-
+		icon_alc.x = allocation->width - (icon_alc.width + border_width);
+		icon_alc.y += border_width;
+	       
 		if (status_box->icon_size != icon_alc.height)
 		{
 			if (status_box->buddy_icon_hover)