Mercurial > pidgin.yaz
comparison pidgin/gtkconv.c @ 21818:1aba82112cf2
Let's try MAX(lines, 2) as suggested by Sean. I've been using (lines + 1)
for a while now and would probably tolerate it as a replacement for manual
resizing, but I might be able to adjust to this too. We'll see.
| author | Stu Tomlinson <stu@nosnilmot.com> |
|---|---|
| date | Wed, 12 Dec 2007 01:48:49 +0000 |
| parents | 770c384b1803 |
| children | a53f4b1813df |
comparison
equal
deleted
inserted
replaced
| 21817:c03139b26b77 | 21818:1aba82112cf2 |
|---|---|
| 4347 | 4347 |
| 4348 pad_top = gtk_text_view_get_pixels_above_lines(GTK_TEXT_VIEW(gtkconv->entry)); | 4348 pad_top = gtk_text_view_get_pixels_above_lines(GTK_TEXT_VIEW(gtkconv->entry)); |
| 4349 pad_bottom = gtk_text_view_get_pixels_below_lines(GTK_TEXT_VIEW(gtkconv->entry)); | 4349 pad_bottom = gtk_text_view_get_pixels_below_lines(GTK_TEXT_VIEW(gtkconv->entry)); |
| 4350 pad_inside = gtk_text_view_get_pixels_inside_wrap(GTK_TEXT_VIEW(gtkconv->entry)); | 4350 pad_inside = gtk_text_view_get_pixels_inside_wrap(GTK_TEXT_VIEW(gtkconv->entry)); |
| 4351 | 4351 |
| 4352 height = (oneline.height + pad_top + pad_bottom) * (lines + 1); | 4352 height = (oneline.height + pad_top + pad_bottom) * MAX(lines, 2); |
| 4353 height += (oneline.height + pad_inside) * (wrapped_lines - lines); | 4353 height += (oneline.height + pad_inside) * (wrapped_lines - lines); |
| 4354 | 4354 |
| 4355 gtkconv->auto_resize = TRUE; | 4355 gtkconv->auto_resize = TRUE; |
| 4356 g_idle_add(reset_auto_resize_cb, gtkconv); | 4356 g_idle_add(reset_auto_resize_cb, gtkconv); |
| 4357 | 4357 |