comparison: pidgin/gtkconv.c
pidgin/gtkconv.c
- changeset 21938
- 615d1409985d
- parent 21935
- ab5d8fa785d5
- parent 21933
- 8915f0c00c52
- child 21940
- 4bcf061ef95b
equal
deleted
inserted
replaced
| 21937:8e9d4dfd09da | 21938:615d1409985d |
|---|---|
| 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 |
