[Gaim-commits] SF.net SVN: gaim: [17904] trunk/gtk/gtkstatusbox.c

[<sa...@us...>]

Revision: 17904
          http://svn.sourceforge.net/gaim/?rev=17904&view=rev
Author:   sadrul
Date:     2006-12-06 18:48:08 -0800 (Wed, 06 Dec 2006)

Log Message:
-----------
I was getting a scrollbar in the statusbox with only one line of message. This fixes that.

Modified Paths:
--------------
    trunk/gtk/gtkstatusbox.c

Modified: trunk/gtk/gtkstatusbox.c
===================================================================
--- trunk/gtk/gtkstatusbox.c	2006-12-06 23:05:51 UTC (rev 17903)
+++ trunk/gtk/gtkstatusbox.c	2006-12-07 02:48:08 UTC (rev 17904)
@@ -1661,7 +1661,7 @@
 	/* If the gtkimhtml is visible, then add some additional padding */
 	gtk_widget_size_request(GTK_GAIM_STATUS_BOX(widget)->vbox, &box_req);
 	if (box_req.height > 1)
-		requisition->height += box_req.height + border_width;
+		requisition->height += box_req.height + border_width * 2;
 
 	requisition->width = 1;
 }
@@ -1726,7 +1726,7 @@
 	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);
+	gtk_widget_size_allocate(status_box->vbox, &box_alc);
 
 	parent_alc = *allocation;
 	parent_alc.height = MAX(1,req.height - (border_width *2));
@@ -2201,6 +2201,7 @@
 
 	wrapped_lines = 1;
 	gtk_text_buffer_get_start_iter(buffer, &iter);
+	gtk_text_view_get_iter_location(GTK_TEXT_VIEW(status_box->imhtml), &iter, &oneline);
 	while (gtk_text_view_forward_display_line(GTK_TEXT_VIEW(status_box->imhtml), &iter))
 		wrapped_lines++;
 
@@ -2210,9 +2211,6 @@
 	lines = MIN(lines, 4);
 	wrapped_lines = MIN(wrapped_lines, 4);
 
-	gtk_text_buffer_get_start_iter(buffer, &iter);
-	gtk_text_view_get_iter_location(GTK_TEXT_VIEW(status_box->imhtml), &iter, &oneline);
-
 	pad_top = gtk_text_view_get_pixels_above_lines(GTK_TEXT_VIEW(status_box->imhtml));
 	pad_bottom = gtk_text_view_get_pixels_below_lines(GTK_TEXT_VIEW(status_box->imhtml));
 	pad_inside = gtk_text_view_get_pixels_inside_wrap(GTK_TEXT_VIEW(status_box->imhtml));


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.