Ignore invisible text when going to end of the previous line. (#382565)

2007-02-18  Matthias Clasen  <mclasen@redhat.com>

        * gtk/gtktextlayout.c (gtk_text_layout_move_iter_visually):
        Ignore invisible text when going to end of the previous line.
        (#382565)

svn path=/trunk/; revision=17328

diff --git a/ChangeLog b/ChangeLog
index 2d50275ac7d50144003b4160958660d971a26b6e..74d3689021dc44b84269cb050387b90b82c49d5e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-02-18  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtktextlayout.c (gtk_text_layout_move_iter_visually):
+       Ignore invisible text when going to end of the previous line.
+       (#382565)
+
 2007-02-18  Richard Hult  <richard@imendio.com>
 
        * gdk/quartz/gdkwindow-quartz.c:

diff --git a/gtk/gtktextlayout.c b/gtk/gtktextlayout.c
index 37696fa4988329a15e44b6349e76034670156924..983944ab38fae92b80ffccf07a06f6847a0e9687 100644 (file)
--- a/gtk/gtktextlayout.c
+++ b/gtk/gtktextlayout.c
@@ -3189,7 +3189,8 @@ gtk_text_layout_move_iter_visually (GtkTextLayout *layout,
           
          gtk_text_layout_free_line_display (layout, display);
          display = gtk_text_layout_get_line_display (layout, line, FALSE);
-          new_index = _gtk_text_line_byte_count (line);
+          gtk_text_iter_forward_to_line_end (&lineiter);
+          new_index = gtk_text_iter_get_visible_line_index (&lineiter);
         }
       else if (new_index > byte_count)
         {