Revert the clamping of cursor coordinates, since it causes really ugly

2007-09-08  Matthias Clasen  <mclasen@redhat.com>

        * gtk/gtkstyle.c (draw_insertion_cursor): Revert the clamping
        of cursor coordinates, since it causes really ugly drawing
        artifacts with horizontal scrolling.  (#471215, Yevgen Muntyan)

svn path=/trunk/; revision=18765

diff --git a/ChangeLog b/ChangeLog
index 7eead36155991fe61efbdadfd4e2c6d82706243c..1ce78732ab4c14b9e27f2270c67e4c3941627142 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-09-08  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkstyle.c (draw_insertion_cursor): Revert the clamping
+       of cursor coordinates, since it causes really ugly drawing
+       artifacts with horizontal scrolling.  (#471215, Yevgen Muntyan)
+
 2007-09-08  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkentrycompletion.c:

diff --git a/gtk/gtkstyle.c b/gtk/gtkstyle.c
index d841fc1c9f83bdb7a2ac0cf6a9dfc2cb5133c974..c2fe979989d9ac33c2031e25758710023e1e0f2a 100644 (file)
--- a/gtk/gtkstyle.c
+++ b/gtk/gtkstyle.c
@@ -6707,7 +6707,6 @@ draw_insertion_cursor (GtkWidget        *widget,
   gint i;
   gfloat cursor_aspect_ratio;
   gint offset;
-  gint window_width;
   
   /* When changing the shape or size of the cursor here,
    * propagate the changes to gtktextview.c:text_window_invalidate_cursors().
@@ -6724,13 +6723,6 @@ draw_insertion_cursor (GtkWidget        *widget,
   else
     offset = stem_width - stem_width / 2;
   
-  gdk_drawable_get_size (widget->window, &window_width, NULL);
-
-  if (location->x - offset < 0 && direction == GTK_TEXT_DIR_LTR)
-    location->x += ABS (location->x - offset);
-  else if (location->x + offset > window_width && direction == GTK_TEXT_DIR_RTL)
-    location->x -= location->x + offset - window_width;
-
   for (i = 0; i < stem_width; i++)
     gdk_draw_line (drawable, gc,
                   location->x + i - offset, location->y,