[evolution-patches] Fix for color shift in image toggle items.

[Larry Ewing <lewing ximian com>]

This fixes a long standing bug in the color chosen for toggle items.

I'm pasting and attaching in case my evo is still broken.

--Larry

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/gal/gal/e-table/ChangeLog,v
retrieving revision 1.909
diff -u -p -r1.909 ChangeLog
--- ChangeLog   8 Aug 2003 09:24:35 -0000       1.909
+++ ChangeLog   12 Aug 2003 22:06:40 -0000
@@ -1,3 +1,8 @@
+2003-08-12  Larry Ewing  <lewing ximian com>
+
+       * e-cell-toggle.c (check_cache): actually chose the right color to
+       composite over when caching the pixmap.
+
 2003-08-08  Stanislav Brabec  <sbrabec suse cz>
                                                                                
        * Makefile.am: Removed trailing backslash on last line.
Index: e-cell-toggle.c
===================================================================
RCS file: /cvs/gnome/gal/gal/e-table/e-cell-toggle.c,v
retrieving revision 1.37
diff -u -p -r1.37 e-cell-toggle.c
--- e-cell-toggle.c     17 Nov 2002 00:02:52 -0000      1.37
+++ e-cell-toggle.c     12 Aug 2003 22:06:40 -0000
@@ -135,7 +135,7 @@ check_cache (ECellToggleView *toggle_vie
        if (PIXMAP_CACHE (toggle_view, cache_seq, image_seq) == NULL) {
                GdkPixbuf *image = etog->images[image_seq];
                GdkPixbuf *flat;
-               guint32 color = 0xffffff;
+               GdkColor  color;
                int width = gdk_pixbuf_get_width (image);
                int height = gdk_pixbuf_get_height (image);
                                                                                
@@ -146,35 +146,18 @@ check_cache (ECellToggleView *toggle_vie
                                                                                
                switch (cache_seq % 3) {
                case 0:
-                       color = RGB_COLOR (GTK_WIDGET (toggle_view->canvas)->style->bg [GTK_STATE_SELECTED]);
+                       color = GTK_WIDGET (toggle_view->canvas)->style->bg [GTK_STATE_SELECTED];
                        break;
                case 1:
-                       color = RGB_COLOR (GTK_WIDGET (toggle_view->canvas)->style->bg [GTK_STATE_ACTIVE]);
+                       color = GTK_WIDGET (toggle_view->canvas)->style->bg [GTK_STATE_ACTIVE];
                        break;
                case 2:
-                       color = RGB_COLOR (GTK_WIDGET (toggle_view->canvas)->style->base [GTK_STATE_NORMAL]);
+                       color = GTK_WIDGET (toggle_view->canvas)->style->base [GTK_STATE_NORMAL];
                        break;
                }
                                                                                
                if (cache_seq >= 3) {
-                       double r, g, b, h, s, v;
-                       r = ((color >> 16) & 0xff) / 255.0f;
-                       g = ((color >> 8) & 0xff) / 255.0f;
-                       b = (color & 0xff) / 255.0f;
-
-                       e_rgb_to_hsv (r, g, b, &h, &s, &v);
-
-                       if (v - 0.05f < 0) {
-                               v += 0.05f;
-                       } else {
-                               v -= 0.05f;
-                       }
-
-                       e_hsv_to_rgb (h, s, v, &r, &g, &b);
-
-                       color = ((((int)(r * 255.0f)) & 0xff) << 16) +
-                               ((((int)(g * 255.0f)) & 0xff) << 8) +
-                               (((int)(b * 255.0f)) & 0xff);
+                       e_hsv_tweak (&color, 0.0f, 0.0f, -0.07f);
                }
                                                                                
                flat = gdk_pixbuf_composite_color_simple (image,
@@ -182,7 +165,7 @@ check_cache (ECellToggleView *toggle_vie
                                                          GDK_INTERP_BILINEAR,
                                                          255,
                                                          1,
-                                                         color, color);
+                                                         RGB_COLOR (color), RGB_COLOR (color));
                                                                                
                gdk_pixbuf_render_to_drawable (flat, PIXMAP_CACHE (toggle_view, cache_seq, image_seq),
                                               toggle_view->gc,


SW5kZXg6IENoYW5nZUxvZw0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PQ0KUkNTIGZpbGU6IC9jdnMvZ25vbWUvZ2FsL2dh
bC9lLXRhYmxlL0NoYW5nZUxvZyx2DQpyZXRyaWV2aW5nIHJldmlzaW9uIDEuOTA5DQpkaWZmIC11
IC1wIC1yMS45MDkgQ2hhbmdlTG9nDQotLS0gQ2hhbmdlTG9nCTggQXVnIDIwMDMgMDk6MjQ6MzUg
LTAwMDAJMS45MDkNCisrKyBDaGFuZ2VMb2cJMTIgQXVnIDIwMDMgMjI6MDY6NDAgLTAwMDANCkBA
IC0xLDMgKzEsOCBAQA0KKzIwMDMtMDgtMTIgIExhcnJ5IEV3aW5nICA8bGV3aW5nQHhpbWlhbi5j
b20+DQorDQorCSogZS1jZWxsLXRvZ2dsZS5jIChjaGVja19jYWNoZSk6IGFjdHVhbGx5IGNob3Nl
IHRoZSByaWdodCBjb2xvciB0bw0KKwljb21wb3NpdGUgb3ZlciB3aGVuIGNhY2hpbmcgdGhlIHBp
eG1hcC4NCisNCiAyMDAzLTA4LTA4ICBTdGFuaXNsYXYgQnJhYmVjICA8c2JyYWJlY0BzdXNlLmN6
Pg0KIA0KIAkqIE1ha2VmaWxlLmFtOiBSZW1vdmVkIHRyYWlsaW5nIGJhY2tzbGFzaCBvbiBsYXN0
IGxpbmUuDQpJbmRleDogZS1jZWxsLXRvZ2dsZS5jDQo9PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQpSQ1MgZmlsZTogL2N2
cy9nbm9tZS9nYWwvZ2FsL2UtdGFibGUvZS1jZWxsLXRvZ2dsZS5jLHYNCnJldHJpZXZpbmcgcmV2
aXNpb24gMS4zNw0KZGlmZiAtdSAtcCAtcjEuMzcgZS1jZWxsLXRvZ2dsZS5jDQotLS0gZS1jZWxs
LXRvZ2dsZS5jCTE3IE5vdiAyMDAyIDAwOjAyOjUyIC0wMDAwCTEuMzcNCisrKyBlLWNlbGwtdG9n
Z2xlLmMJMTIgQXVnIDIwMDMgMjI6MDY6NDAgLTAwMDANCkBAIC0xMzUsNyArMTM1LDcgQEAgY2hl
Y2tfY2FjaGUgKEVDZWxsVG9nZ2xlVmlldyAqdG9nZ2xlX3ZpZQ0KIAlpZiAoUElYTUFQX0NBQ0hF
ICh0b2dnbGVfdmlldywgY2FjaGVfc2VxLCBpbWFnZV9zZXEpID09IE5VTEwpIHsNCiAJCUdka1Bp
eGJ1ZiAqaW1hZ2UgPSBldG9nLT5pbWFnZXNbaW1hZ2Vfc2VxXTsNCiAJCUdka1BpeGJ1ZiAqZmxh
dDsNCi0JCWd1aW50MzIgY29sb3IgPSAweGZmZmZmZjsNCisJCUdka0NvbG9yICBjb2xvcjsNCiAJ
CWludCB3aWR0aCA9IGdka19waXhidWZfZ2V0X3dpZHRoIChpbWFnZSk7DQogCQlpbnQgaGVpZ2h0
ID0gZ2RrX3BpeGJ1Zl9nZXRfaGVpZ2h0IChpbWFnZSk7DQogDQpAQCAtMTQ2LDM1ICsxNDYsMTgg
QEAgY2hlY2tfY2FjaGUgKEVDZWxsVG9nZ2xlVmlldyAqdG9nZ2xlX3ZpZQ0KIAkJDQogCQlzd2l0
Y2ggKGNhY2hlX3NlcSAlIDMpIHsNCiAJCWNhc2UgMDoNCi0JCQljb2xvciA9IFJHQl9DT0xPUiAo
R1RLX1dJREdFVCAodG9nZ2xlX3ZpZXctPmNhbnZhcyktPnN0eWxlLT5iZyBbR1RLX1NUQVRFX1NF
TEVDVEVEXSk7DQorCQkJY29sb3IgPSBHVEtfV0lER0VUICh0b2dnbGVfdmlldy0+Y2FudmFzKS0+
c3R5bGUtPmJnIFtHVEtfU1RBVEVfU0VMRUNURURdOw0KIAkJCWJyZWFrOw0KIAkJY2FzZSAxOg0K
LQkJCWNvbG9yID0gUkdCX0NPTE9SIChHVEtfV0lER0VUICh0b2dnbGVfdmlldy0+Y2FudmFzKS0+
c3R5bGUtPmJnIFtHVEtfU1RBVEVfQUNUSVZFXSk7DQorCQkJY29sb3IgPSBHVEtfV0lER0VUICh0
b2dnbGVfdmlldy0+Y2FudmFzKS0+c3R5bGUtPmJnIFtHVEtfU1RBVEVfQUNUSVZFXTsNCiAJCQli
cmVhazsNCiAJCWNhc2UgMjoNCi0JCQljb2xvciA9IFJHQl9DT0xPUiAoR1RLX1dJREdFVCAodG9n
Z2xlX3ZpZXctPmNhbnZhcyktPnN0eWxlLT5iYXNlIFtHVEtfU1RBVEVfTk9STUFMXSk7DQorCQkJ
Y29sb3IgPSBHVEtfV0lER0VUICh0b2dnbGVfdmlldy0+Y2FudmFzKS0+c3R5bGUtPmJhc2UgW0dU
S19TVEFURV9OT1JNQUxdOw0KIAkJCWJyZWFrOw0KIAkJfQ0KIA0KIAkJaWYgKGNhY2hlX3NlcSA+
PSAzKSB7DQotCQkJZG91YmxlIHIsIGcsIGIsIGgsIHMsIHY7DQotCQkJciA9ICgoY29sb3IgPj4g
MTYpICYgMHhmZikgLyAyNTUuMGY7DQotCQkJZyA9ICgoY29sb3IgPj4gOCkgJiAweGZmKSAvIDI1
NS4wZjsNCi0JCQliID0gKGNvbG9yICYgMHhmZikgLyAyNTUuMGY7DQotDQotCQkJZV9yZ2JfdG9f
aHN2IChyLCBnLCBiLCAmaCwgJnMsICZ2KTsNCi0JDQotCQkJaWYgKHYgLSAwLjA1ZiA8IDApIHsN
Ci0JCQkJdiArPSAwLjA1ZjsNCi0JCQl9IGVsc2Ugew0KLQkJCQl2IC09IDAuMDVmOw0KLQkJCX0N
Ci0NCi0JCQllX2hzdl90b19yZ2IgKGgsIHMsIHYsICZyLCAmZywgJmIpOw0KLQ0KLQkJCWNvbG9y
ID0gKCgoKGludCkociAqIDI1NS4wZikpICYgMHhmZikgPDwgMTYpICsNCi0JCQkJKCgoKGludCko
ZyAqIDI1NS4wZikpICYgMHhmZikgPDwgOCkgKw0KLQkJCQkoKChpbnQpKGIgKiAyNTUuMGYpKSAm
IDB4ZmYpOw0KKwkJCWVfaHN2X3R3ZWFrICgmY29sb3IsIDAuMGYsIDAuMGYsIC0wLjA3Zik7DQog
CQl9DQogDQogCQlmbGF0ID0gZ2RrX3BpeGJ1Zl9jb21wb3NpdGVfY29sb3Jfc2ltcGxlIChpbWFn
ZSwNCkBAIC0xODIsNyArMTY1LDcgQEAgY2hlY2tfY2FjaGUgKEVDZWxsVG9nZ2xlVmlldyAqdG9n
Z2xlX3ZpZQ0KIAkJCQkJCQkgIEdES19JTlRFUlBfQklMSU5FQVIsDQogCQkJCQkJCSAgMjU1LA0K
IAkJCQkJCQkgIDEsDQotCQkJCQkJCSAgY29sb3IsIGNvbG9yKTsNCisJCQkJCQkJICBSR0JfQ09M
T1IgKGNvbG9yKSwgUkdCX0NPTE9SIChjb2xvcikpOw0KIA0KIAkJZ2RrX3BpeGJ1Zl9yZW5kZXJf
dG9fZHJhd2FibGUgKGZsYXQsIFBJWE1BUF9DQUNIRSAodG9nZ2xlX3ZpZXcsIGNhY2hlX3NlcSwg
aW1hZ2Vfc2VxKSwNCiAJCQkJCSAgICAgICB0b2dnbGVfdmlldy0+Z2MsDQo=