summaryrefslogtreecommitdiff
path: root/gtk/gtktextdisplay.c
diff options
context:
space:
mode:
authorHavoc Pennington <hp@redhat.com>2001-11-13 23:56:11 +0000
committerHavoc Pennington <hp@src.gnome.org>2001-11-13 23:56:11 +0000
commit8befd2f82291c9812d101089c35db1982a41b6c4 (patch)
tree6903f7f9390dc810c760aa934aea5076b1646516 /gtk/gtktextdisplay.c
parent10b3db083625acb6f6ae2904b9de39c8dc829a04 (diff)
downloadgtk+-8befd2f82291c9812d101089c35db1982a41b6c4.tar.gz
fix to properly replace selection with Return or Tab
2001-11-13 Havoc Pennington <hp@redhat.com> * gtk/gtktextview.c (gtk_text_view_key_press_event): fix to properly replace selection with Return or Tab * gtk/gtktextdisplay.c (gtk_text_layout_draw): fix broken code that didn't locate the end of the line correctly, should fix #63800
Diffstat (limited to 'gtk/gtktextdisplay.c')
-rw-r--r--gtk/gtktextdisplay.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/gtk/gtktextdisplay.c b/gtk/gtktextdisplay.c
index 1d53096a42..fd5a9d137e 100644
--- a/gtk/gtktextdisplay.c
+++ b/gtk/gtktextdisplay.c
@@ -785,12 +785,9 @@ gtk_text_layout_draw (GtkTextLayout *layout,
gtk_text_layout_get_iter_at_line (layout,
&line_start,
line, 0);
- byte_count = gtk_text_iter_get_bytes_in_line (&line_start);
-
- /* FIXME the -1 assumes a newline I think */
- gtk_text_layout_get_iter_at_line (layout,
- &line_end,
- line, byte_count - 1);
+ line_end = line_start;
+ gtk_text_iter_forward_to_line_end (&line_end);
+ byte_count = gtk_text_iter_get_line_index (&line_end);
if (gtk_text_iter_compare (&selection_start, &line_end) <= 0 &&
gtk_text_iter_compare (&selection_end, &line_start) >= 0)