2007-01-17 [colin] 2.7.1cvs18

	* src/summaryview.c
		Fix bug 1100, 'Highlighted e-mail data not visible
		when color label applied.'. Use a weighted average
		between normal selected foreground color and color
		label instead of a simple one (3/1 instead 1/1).

diff --git a/ChangeLog b/ChangeLog
index a2af3fd6e45dc18b5678c8678a0c470d3152a3a5..3dfb421b660ec5377fb1c4db53ab4323fbf5c630 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-01-17 [colin]     2.7.1cvs18
+
+       * src/summaryview.c
+               Fix bug 1100, 'Highlighted e-mail data not visible 
+               when color label applied.'. Use a weighted average
+               between normal selected foreground color and color
+               label instead of a simple one (3/1 instead 1/1).
+
 2007-01-17 [colin]     2.7.1cvs17
 
        * src/messageview.c

diff --git a/PATCHSETS b/PATCHSETS
index 2dee91aa146e6366d1ef1d4f1a42a5555971e6c2..a5b5934f31cea678b2b3695e6bb463c7aa7a742a 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2275,3 +2275,4 @@
 ( cvs diff -u -r 1.204.2.117 -r 1.204.2.118 src/prefs_common.c;  cvs diff -u -r 1.5.2.42 -r 1.5.2.43 src/gtk/pluginwindow.c;  ) > 2.7.1cvs15.patchset
 ( cvs diff -u -r 1.213.2.130 -r 1.213.2.131 src/folder.c;  cvs diff -u -r 1.87.2.35 -r 1.87.2.36 src/folder.h;  cvs diff -u -r 1.207.2.143 -r 1.207.2.144 src/folderview.c;  cvs diff -u -r 1.20.2.16 -r 1.20.2.17 src/folderview.h;  cvs diff -u -r 1.179.2.153 -r 1.179.2.154 src/imap.c;  cvs diff -u -r 1.34.2.12 -r 1.34.2.13 src/imap.h;  cvs diff -u -r 1.1.2.40 -r 1.1.2.41 src/imap_gtk.c;  ) > 2.7.1cvs16.patchset
 ( cvs diff -u -r 1.94.2.118 -r 1.94.2.119 src/messageview.c;  ) > 2.7.1cvs17.patchset
+( cvs diff -u -r 1.395.2.277 -r 1.395.2.278 src/summaryview.c;  ) > 2.7.1cvs18.patchset

diff --git a/configure.ac b/configure.ac
index 494cf93d3ce79ecaf5fe0e4af4fa1ad5276be6cb..1584e62a9fb816e3ee5a7d913d36c230115c5ebd 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=7
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=17
+EXTRA_VERSION=18
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/summaryview.c b/src/summaryview.c
index 8a88807f0df4aa4e4c73c93a1f5cc79b63194c43..2565139d5e349582bdf081173487a977cabc6389 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -4879,9 +4879,9 @@ void summary_set_colorlabel_color(GtkCTree *ctree, GtkCTreeNode *node,
                style->fg[GTK_STATE_NORMAL] = color;
                /* get the average of label color and selected fg color
                   for visibility */
-               style->fg[GTK_STATE_SELECTED].red   = (color.red   + ctree_style->fg[GTK_STATE_SELECTED].red  ) / 2;
-               style->fg[GTK_STATE_SELECTED].green = (color.green + ctree_style->fg[GTK_STATE_SELECTED].green) / 2;
-               style->fg[GTK_STATE_SELECTED].blue  = (color.blue  + ctree_style->fg[GTK_STATE_SELECTED].blue ) / 2;
+               style->fg[GTK_STATE_SELECTED].red   = (color.red   + 3*ctree_style->fg[GTK_STATE_SELECTED].red  ) / 4;
+               style->fg[GTK_STATE_SELECTED].green = (color.green + 3*ctree_style->fg[GTK_STATE_SELECTED].green) / 4;
+               style->fg[GTK_STATE_SELECTED].blue  = (color.blue  + 3*ctree_style->fg[GTK_STATE_SELECTED].blue ) / 4;
        }
 
        gtk_ctree_node_set_row_style(ctree, node, style);