talons

commit f21070577e03d79306db3e876f060fc9675ff85c
parent 3d4b08fe446dce93193e36b334782fb7101fc8b2
Author: Colin Leroy <colin@colino.net>
Date:   Wed, 29 Feb 2012 16:48:40 +0000

2012-02-29 [colin]	3.8.0cvs30

	* src/gtk/gtkcmctree.c
		Fix bug #2577, "Focus rectangle on folder list and message
		list headings doesn't get properly cleared when switching
		heading and horizontally scrolling list (underlines and
		vertical lines remain on screen)". Patch by Michael Shell

Diffstat:
M
ChangeLog
 | 
8
++++++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/gtk/gtkcmctree.c
 | 
11
++++++++---

4 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,11 @@
+2012-02-29 [colin]	3.8.0cvs30
+
+	* src/gtk/gtkcmctree.c
+		Fix bug #2577, "Focus rectangle on folder list and message 
+		list headings doesn't get properly cleared when switching 
+		heading and horizontally scrolling list (underlines and 
+		vertical lines remain on screen)". Patch by Michael Shell
+
 2012-02-13 [pawel]	3.8.0cvs29
 
 	* src/messageview.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -4346,3 +4346,4 @@
 ( cvs diff -u -r 1.60.2.78 -r 1.60.2.79 src/prefs_actions.c;  cvs diff -u -r 1.5.2.8 -r 1.5.2.9 src/prefs_actions.h;  cvs diff -u -r 1.30.2.69 -r 1.30.2.70 src/prefs_toolbar.c;  cvs diff -u -r 1.5.2.12 -r 1.5.2.13 src/prefs_toolbar.h;  cvs diff -u -r 1.43.2.125 -r 1.43.2.126 src/toolbar.c;  cvs diff -u -r 1.19.2.33 -r 1.19.2.34 src/toolbar.h;  ) > 3.8.0cvs27.patchset
 ( cvs diff -u -r 1.60.2.60 -r 1.60.2.61 src/filtering.c;  ) > 3.8.0cvs28.patchset
 ( cvs diff -u -r 1.94.2.227 -r 1.94.2.228 src/messageview.c;  ) > 3.8.0cvs29.patchset
+( cvs diff -u -r 1.1.2.28 -r 1.1.2.29 src/gtk/gtkcmctree.c;  ) > 3.8.0cvs30.patchset
diff --git a/configure.ac b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=8
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=29
+EXTRA_VERSION=30
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/gtk/gtkcmctree.c b/src/gtk/gtkcmctree.c
@@ -695,6 +695,8 @@ draw_row (GtkCMCList     *clist,
         gdk_cairo_rectangle(cr, &cell_rectangle);
 	gdk_cairo_set_source_color(cr, &style->base[GTK_STATE_NORMAL]);
 	cairo_fill(cr);
+	cairo_rectangle(cr, cell_rectangle.x, cell_rectangle.y + row_rectangle.height + 1,cell_rectangle.width,cell_rectangle.height);
+	cairo_fill(cr);
       }
     }
   else
@@ -704,6 +706,8 @@ draw_row (GtkCMCList     *clist,
       gdk_cairo_rectangle(cr, &cell_rectangle);
       gdk_cairo_set_source_color(cr, &style->base[GTK_STATE_NORMAL]);
       cairo_fill(cr);
+      cairo_rectangle(cr, cell_rectangle.x, cell_rectangle.y + row_rectangle.height + 1,cell_rectangle.width,cell_rectangle.height);
+      cairo_fill(cr);
     }
 
   /* the last row has to clear its bottom cell spacing too */
@@ -938,9 +942,10 @@ draw_row (GtkCMCList     *clist,
 	    cairo_set_line_width(cr, 1.0);
 	    cairo_set_antialias(cr, CAIRO_ANTIALIAS_NONE);
 	    gdk_cairo_set_source_color(cr, &style->fg[GTK_STATE_NORMAL]);
-	    cairo_rectangle(cr, row_rectangle.x, row_rectangle.y,
-			      row_rectangle.width + 1,
-			      row_rectangle.height);
+	    cairo_move_to (cr, row_rectangle.x, row_rectangle.y + 0.5);
+	    cairo_line_to (cr, row_rectangle.x + row_rectangle.width, row_rectangle.y + 0.5);
+	    cairo_move_to (cr, row_rectangle.x, row_rectangle.y + row_rectangle.height - 0.5);
+	    cairo_line_to (cr, row_rectangle.x + row_rectangle.width, row_rectangle.y + row_rectangle.height - 0.5);
 	    cairo_stroke(cr);
 	}
      }