changeset 27802:4d8e1c17b3f9

"-diff < oneline.height / 2" broke fixed height of entry field
author Yoshiki Yazawa <yaz@honeyplanet.jp>
date Mon, 17 Mar 2008 07:20:59 +0000
parents f8b47fd39f53
children 8dfe3a985fc1
files pidgin/gtkconv.c
diffstat 1 files changed, 1 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/pidgin/gtkconv.c	Mon Mar 17 07:07:05 2008 +0000
+++ b/pidgin/gtkconv.c	Mon Mar 17 07:20:59 2008 +0000
@@ -4467,8 +4467,7 @@
 		height += (oneline.height + pad_inside) * (wrapped_lines - lines);
 
 	diff = height - gtkconv->entry->allocation.height;
-//	if (diff <= 0)
-	if (diff == 0 || (diff < 0 && -diff < oneline.height / 2))
+	if (diff <= 0)
 		return FALSE;
 
 	gtk_widget_size_request(gtkconv->lower_hbox, &sr);