make sure that the text_area_width is always >= 0. Fixes bug #316712 (Dan

2006-03-08  Michael Natterer  <mitch@imendio.com>

	* gtk/gtkentry.c (gtk_entry_adjust_scroll): make sure that the
	text_area_width is always >= 0. Fixes bug #316712 (Dan Winship).
This commit is contained in:
Michael Natterer 2006-03-08 14:04:53 +00:00 committed by Michael Natterer
parent 70dd1e16b1
commit 3961acfb68
3 changed files with 12 additions and 0 deletions

View File

@ -1,3 +1,8 @@
2006-03-08 Michael Natterer <mitch@imendio.com>
* gtk/gtkentry.c (gtk_entry_adjust_scroll): make sure that the
text_area_width is always >= 0. Fixes bug #316712 (Dan Winship).
2006-03-07 Federico Mena Quintero <federico@novell.com> 2006-03-07 Federico Mena Quintero <federico@novell.com>
Cancel drags when the grabs get broken. Fixes bug #333056: Cancel drags when the grabs get broken. Fixes bug #333056:

View File

@ -1,3 +1,8 @@
2006-03-08 Michael Natterer <mitch@imendio.com>
* gtk/gtkentry.c (gtk_entry_adjust_scroll): make sure that the
text_area_width is always >= 0. Fixes bug #316712 (Dan Winship).
2006-03-07 Federico Mena Quintero <federico@novell.com> 2006-03-07 Federico Mena Quintero <federico@novell.com>
Cancel drags when the grabs get broken. Fixes bug #333056: Cancel drags when the grabs get broken. Fixes bug #333056:

View File

@ -3463,6 +3463,8 @@ gtk_entry_adjust_scroll (GtkEntry *entry)
gdk_drawable_get_size (entry->text_area, &text_area_width, NULL); gdk_drawable_get_size (entry->text_area, &text_area_width, NULL);
text_area_width -= 2 * INNER_BORDER; text_area_width -= 2 * INNER_BORDER;
if (text_area_width < 0)
text_area_width = 0;
layout = gtk_entry_ensure_layout (entry, TRUE); layout = gtk_entry_ensure_layout (entry, TRUE);
line = pango_layout_get_lines (layout)->data; line = pango_layout_get_lines (layout)->data;