Mercurial > pidgin3 / changeset

• changeset
• raw

changeset

[gaim-migrate @ 15258]

Tue, 17 Jan 2006 03:02:36 +0000

author

Sadrul Habib Chowdhury <sadrul@pidgin.im>

date

Tue, 17 Jan 2006 03:02:36 +0000

changeset 12905

e650ee76e1b8

parent 12904

f01835b6bcac

child 12906

0ef3f629f00f

[gaim-migrate @ 15258]
SF Patch #1406437 from Sadrul

"Create the imhtml as non-editable, to make
sure the toolbar doesn't appear, then make it editable.
The problem with this is that for non-editable
imhtml-s, the scrollbar-policy is _ALWAYS for
vertical-scrollbar. The version-1 of the patches turns
it into _AUTOMATIC. This removes the always-present
vertical-scrollbar from the conversation or
info-imhtmls as well. I doubt this breaks anything."

I'm curious why we were ever forcing vertical scrollbars on non-editable imhtmls.

committer: Richard Laager <rlaager@pidgin.im>

--- a/src/gtkstatusbox.c	Tue Jan 17 03:00:54 2006 +0000
+++ b/src/gtkstatusbox.c	Tue Jan 17 03:02:36 2006 +0000
@@ -1146,7 +1146,7 @@
 	height = (oneline.height + pad_top + pad_bottom) * lines;
 	height += (oneline.height + pad_inside) * (wrapped_lines - lines);
 
-	gtk_widget_set_size_request(status_box->vbox, -1, height);
+	gtk_widget_set_size_request(status_box->vbox, -1, height + GAIM_HIG_BOX_SPACE);
 }
 
 static void remove_typing_cb(GtkGaimStatusBox *status_box)

--- a/src/gtkutils.c	Tue Jan 17 03:00:54 2006 +0000
+++ b/src/gtkutils.c	Tue Jan 17 03:02:36 2006 +0000
@@ -138,7 +138,7 @@
 									   GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
 	else
 		gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw),
-									   GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS);
+									   GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
 	gtk_box_pack_start(GTK_BOX(vbox), sw, TRUE, TRUE, 0);
 	gtk_widget_show(sw);