2012-03-11 [colin] 3.8.0cvs31
authorColin Leroy <colin@colino.net>
Sun, 11 Mar 2012 09:19:24 +0000 (09:19 +0000)
committerColin Leroy <colin@colino.net>
Sun, 11 Mar 2012 09:19:24 +0000 (09:19 +0000)
* src/gtk/gtkcmctree.c
* src/gtk/authors.h
* AUTHORS
Fix focus rectangle on unfocused rows
Patch by Michael Shell

AUTHORS
ChangeLog
PATCHSETS
configure.ac
src/gtk/authors.h
src/gtk/gtkcmctree.c

diff --git a/AUTHORS b/AUTHORS
index ffe6ae1..ded75fa 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -287,3 +287,4 @@ contributors (in addition to the above; based on Changelog)
        Steve Rader
        Hanno Meyer-Thurow
        Bodo Graumann
+       Michael Shell
index 8c6b4a6..368b4e9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2012-03-11 [colin]     3.8.0cvs31
+
+       * src/gtk/gtkcmctree.c
+       * src/gtk/authors.h
+       * AUTHORS
+               Fix focus rectangle on unfocused rows
+               Patch by Michael Shell
+
 2012-02-29 [colin]     3.8.0cvs30
 
        * src/gtk/gtkcmctree.c
index 4ba2fc7..f072abf 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( 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
+( cvs diff -u -r 1.1.2.29 -r 1.1.2.30 src/gtk/gtkcmctree.c;  cvs diff -u -r 1.1.2.76 -r 1.1.2.77 src/gtk/authors.h;  cvs diff -u -r 1.100.2.81 -r 1.100.2.82 AUTHORS;  ) > 3.8.0cvs31.patchset
index 19b247c..b124175 100644 (file)
@@ -12,7 +12,7 @@ MINOR_VERSION=8
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=30
+EXTRA_VERSION=31
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index 9d7fcd5..08ce58c 100644 (file)
@@ -232,6 +232,7 @@ static char *CONTRIBS_LIST[] = {
 "Markus Schwarzenberg",
 "Rodrigo Dias Arruda Senra",
 "Setoh",
+"Michael Shell",
 "shigeri",
 "Gustavo Noronha Silva",
 "Jesse Skinner",
index 276a810..8ad5e24 100644 (file)
@@ -934,7 +934,8 @@ draw_row (GtkCMCList     *clist,
     }
    /* draw focus rectangle */
   if (clist->focus_row == row &&
-      gtk_widget_get_can_focus (widget) && gtk_widget_has_focus (widget))
+      gtk_widget_get_can_focus (widget) && gtk_widget_has_focus (widget)
+       && state == GTK_STATE_SELECTED)
     {
       if (!area || gdk_rectangle_intersect (area, &row_rectangle,
                                        &intersect_rectangle))