Remove extra pixel from the cursor (render_layout_line): fix reversed test

2000-11-15  Havoc Pennington  <hp@redhat.com>

	* gtk/gtktextdisplay.c (gtk_text_layout_draw): Remove extra pixel
	from the cursor
	(render_layout_line): fix reversed test that caused weird
	underlines to get drawn

8 files changed, 52 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index d4ae368845..bd70adab04 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2000-11-15  Havoc Pennington  <hp@redhat.com>
+
+	* gtk/gtktextdisplay.c (gtk_text_layout_draw): Remove extra pixel
+	from the cursor
+	(render_layout_line): fix reversed test that caused weird
+	underlines to get drawn
+
 2000-11-15  Alexander Larsson  <alla@lysator.liu.se>
 
 	* gdk/linux-fb/gdkprivate-fb.h:
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index d4ae368845..bd70adab04 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,10 @@
+2000-11-15  Havoc Pennington  <hp@redhat.com>
+
+	* gtk/gtktextdisplay.c (gtk_text_layout_draw): Remove extra pixel
+	from the cursor
+	(render_layout_line): fix reversed test that caused weird
+	underlines to get drawn
+
 2000-11-15  Alexander Larsson  <alla@lysator.liu.se>
 
 	* gdk/linux-fb/gdkprivate-fb.h:
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index d4ae368845..bd70adab04 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+2000-11-15  Havoc Pennington  <hp@redhat.com>
+
+	* gtk/gtktextdisplay.c (gtk_text_layout_draw): Remove extra pixel
+	from the cursor
+	(render_layout_line): fix reversed test that caused weird
+	underlines to get drawn
+
 2000-11-15  Alexander Larsson  <alla@lysator.liu.se>
 
 	* gdk/linux-fb/gdkprivate-fb.h:
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index d4ae368845..bd70adab04 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,10 @@
+2000-11-15  Havoc Pennington  <hp@redhat.com>
+
+	* gtk/gtktextdisplay.c (gtk_text_layout_draw): Remove extra pixel
+	from the cursor
+	(render_layout_line): fix reversed test that caused weird
+	underlines to get drawn
+
 2000-11-15  Alexander Larsson  <alla@lysator.liu.se>
 
 	* gdk/linux-fb/gdkprivate-fb.h:
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index d4ae368845..bd70adab04 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,10 @@
+2000-11-15  Havoc Pennington  <hp@redhat.com>
+
+	* gtk/gtktextdisplay.c (gtk_text_layout_draw): Remove extra pixel
+	from the cursor
+	(render_layout_line): fix reversed test that caused weird
+	underlines to get drawn
+
 2000-11-15  Alexander Larsson  <alla@lysator.liu.se>
 
 	* gdk/linux-fb/gdkprivate-fb.h:
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index d4ae368845..bd70adab04 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+2000-11-15  Havoc Pennington  <hp@redhat.com>
+
+	* gtk/gtktextdisplay.c (gtk_text_layout_draw): Remove extra pixel
+	from the cursor
+	(render_layout_line): fix reversed test that caused weird
+	underlines to get drawn
+
 2000-11-15  Alexander Larsson  <alla@lysator.liu.se>
 
 	* gdk/linux-fb/gdkprivate-fb.h:
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index d4ae368845..bd70adab04 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+2000-11-15  Havoc Pennington  <hp@redhat.com>
+
+	* gtk/gtktextdisplay.c (gtk_text_layout_draw): Remove extra pixel
+	from the cursor
+	(render_layout_line): fix reversed test that caused weird
+	underlines to get drawn
+
 2000-11-15  Alexander Larsson  <alla@lysator.liu.se>
 
 	* gdk/linux-fb/gdkprivate-fb.h:
diff --git a/gtk/gtktextdisplay.c b/gtk/gtktextdisplay.c
index 55e8ba3fba..ebe457549c 100644
--- a/gtk/gtktextdisplay.c
+++ b/gtk/gtktextdisplay.c
@@ -265,10 +265,10 @@ render_layout_line (GdkDrawable        *drawable,
         {
           if (need_ink)
             pango_glyph_string_extents (run->glyphs, run->item->analysis.font,
-                                        NULL, &logical_rect);
+                                        &ink_rect, &logical_rect);
           else
             pango_glyph_string_extents (run->glyphs, run->item->analysis.font,
-                                        &ink_rect, &logical_rect);
+                                        NULL, &logical_rect);
         }
       else
         {
@@ -785,7 +785,7 @@ gtk_text_layout_draw (GtkTextLayout *layout,
                          line_display->x_offset + cursor->x,
                          current_y + line_display->top_margin + cursor->y,
                          line_display->x_offset + cursor->x,
-                         current_y + line_display->top_margin + cursor->y + cursor->height);
+                         current_y + line_display->top_margin + cursor->y + cursor->height - 1);
 
           cursor_list = cursor_list->next;
         }