Remove some strange arithmetic that was resulting in rows being drawn too

Fri Nov 23 18:49:53 2001  Owen Taylor  <otaylor@redhat.com>
	* gtk/{gtkclist,gtkctree.c} (draw_row): Remove some strange
	arithmetic that was resulting in rows being drawn too low.
	(#65001, reported by Damon Chaplin)

diff --git a/ChangeLog b/ChangeLog
index b5b77d332c2ee311ba1ebbd2c374c6f78d3bee4a..75fb77048c1f6c20f1437e3a261f630ba7859950 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Nov 23 18:49:53 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/{gtkclist,gtkctree.c} (draw_row): Remove some strange
+       arithmetic that was resulting in rows being drawn too low.
+       (#65001, reported by Damon Chaplin)
+
 Fri Nov 23 18:36:42 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkrange.c (gtk_range_button_press): Offset 

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index b5b77d332c2ee311ba1ebbd2c374c6f78d3bee4a..75fb77048c1f6c20f1437e3a261f630ba7859950 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,9 @@
+Fri Nov 23 18:49:53 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/{gtkclist,gtkctree.c} (draw_row): Remove some strange
+       arithmetic that was resulting in rows being drawn too low.
+       (#65001, reported by Damon Chaplin)
+
 Fri Nov 23 18:36:42 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkrange.c (gtk_range_button_press): Offset 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index b5b77d332c2ee311ba1ebbd2c374c6f78d3bee4a..75fb77048c1f6c20f1437e3a261f630ba7859950 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Fri Nov 23 18:49:53 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/{gtkclist,gtkctree.c} (draw_row): Remove some strange
+       arithmetic that was resulting in rows being drawn too low.
+       (#65001, reported by Damon Chaplin)
+
 Fri Nov 23 18:36:42 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkrange.c (gtk_range_button_press): Offset 

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index b5b77d332c2ee311ba1ebbd2c374c6f78d3bee4a..75fb77048c1f6c20f1437e3a261f630ba7859950 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+Fri Nov 23 18:49:53 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/{gtkclist,gtkctree.c} (draw_row): Remove some strange
+       arithmetic that was resulting in rows being drawn too low.
+       (#65001, reported by Damon Chaplin)
+
 Fri Nov 23 18:36:42 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkrange.c (gtk_range_button_press): Offset 

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index b5b77d332c2ee311ba1ebbd2c374c6f78d3bee4a..75fb77048c1f6c20f1437e3a261f630ba7859950 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+Fri Nov 23 18:49:53 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/{gtkclist,gtkctree.c} (draw_row): Remove some strange
+       arithmetic that was resulting in rows being drawn too low.
+       (#65001, reported by Damon Chaplin)
+
 Fri Nov 23 18:36:42 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkrange.c (gtk_range_button_press): Offset 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index b5b77d332c2ee311ba1ebbd2c374c6f78d3bee4a..75fb77048c1f6c20f1437e3a261f630ba7859950 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Fri Nov 23 18:49:53 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/{gtkclist,gtkctree.c} (draw_row): Remove some strange
+       arithmetic that was resulting in rows being drawn too low.
+       (#65001, reported by Damon Chaplin)
+
 Fri Nov 23 18:36:42 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkrange.c (gtk_range_button_press): Offset 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index b5b77d332c2ee311ba1ebbd2c374c6f78d3bee4a..75fb77048c1f6c20f1437e3a261f630ba7859950 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Fri Nov 23 18:49:53 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/{gtkclist,gtkctree.c} (draw_row): Remove some strange
+       arithmetic that was resulting in rows being drawn too low.
+       (#65001, reported by Damon Chaplin)
+
 Fri Nov 23 18:36:42 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkrange.c (gtk_range_button_press): Offset 

diff --git a/gtk/gtkclist.c b/gtk/gtkclist.c
index 791bc9817cdf5f97f1c90d0d543c45a799d94825..1e73ed5b634123ab4f6ada5cd12b6e6011a87c67 100644 (file)
--- a/gtk/gtkclist.c
+++ b/gtk/gtkclist.c
@@ -5853,7 +5853,7 @@ draw_row (GtkCList     *clist,
        case GTK_CELL_TEXT:
          if (layout)
            {
-             gint row_center_offset = 1.5 + (clist->row_height - logical_rect.height - 1) / 2;
+             gint row_center_offset = (clist->row_height - logical_rect.height - 1) / 2;
 
              gdk_gc_set_clip_rectangle (fg_gc, &clip_rectangle);
              gdk_draw_layout (clist->clist_window, fg_gc,

diff --git a/gtk/gtkctree.c b/gtk/gtkctree.c
index 9e5c6a33c95e129c69c89946bcb85d64da15abdd..f195f6a4999b84d77a2fa22b29a43b05afa8b3bc 100644 (file)
--- a/gtk/gtkctree.c
+++ b/gtk/gtkctree.c
@@ -1936,7 +1936,7 @@ draw_row (GtkCList     *clist,
                case GTK_CELL_TEXT:
                  if (layout)
                    {
-                     gint row_center_offset = 1.5 + (clist->row_height - logical_rect.height - 1) / 2;
+                     gint row_center_offset = (clist->row_height - logical_rect.height) / 2;
 
                      gdk_gc_set_clip_rectangle (fg_gc, &clip_rectangle);
                      gdk_draw_layout (clist->clist_window, fg_gc,