diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 5 | ||||
| -rw-r--r-- | gtk/gtkentry.c | 2 |
3 files changed, 12 insertions, 0 deletions
@@ -1,3 +1,8 @@ +Wed Mar 8 15:17:21 2006 Tim Janik <timj@imendio.com> + + * gtk/gtkentry.c (gtk_entry_adjust_scroll): constrain text area to + positive values (#316712). + 2006-03-08 Matthias Clasen <mclasen@redhat.com> * NEWS: Updates diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index de10ce4d7..e2d2408b6 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Wed Mar 8 15:17:21 2006 Tim Janik <timj@imendio.com> + + * gtk/gtkentry.c (gtk_entry_adjust_scroll): constrain text area to + positive values (#316712). + 2006-03-08 Matthias Clasen <mclasen@redhat.com> * NEWS: Updates diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c index f67c73144..1492ce39c 100644 --- a/gtk/gtkentry.c +++ b/gtk/gtkentry.c @@ -3420,6 +3420,8 @@ gtk_entry_adjust_scroll (GtkEntry *entry) gdk_drawable_get_size (entry->text_area, &text_area_width, NULL); text_area_width -= 2 * INNER_BORDER; + if (text_area_width < 0) + text_area_width = 0; layout = gtk_entry_ensure_layout (entry, TRUE); line = pango_layout_get_lines (layout)->data; |