From 0f0b0505101a3c3adbaaa0e74435d072aa4976ff Mon Sep 17 00:00:00 2001 From: Michael Jennings Date: Sat, 28 Apr 2001 19:10:26 +0000 Subject: [PATCH] Sat Apr 28 12:08:56 PDT 2001 Michael Jennings Fixed handling of color modifiers for transparency in the disabled state. Bug pointed out by Hans Engren . SVN revision: 4676 --- ChangeLog | 6 ++++++ src/pixmap.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 7ff98de..01f9ca1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4077,3 +4077,9 @@ Mon Mar 5 13:38:01 PST 2001 Michael Jennings Fix for NetBSD from Marc Bevand . ------------------------------------------------------------------------------- +Sat Apr 28 12:08:56 PDT 2001 Michael Jennings + + Fixed handling of color modifiers for transparency in the disabled + state. Bug pointed out by Hans Engren . + +------------------------------------------------------------------------------- diff --git a/src/pixmap.c b/src/pixmap.c index d358c82..20ff128 100644 --- a/src/pixmap.c +++ b/src/pixmap.c @@ -563,7 +563,7 @@ create_trans_pixmap(simage_t *simg, unsigned char which, Drawable d, int x, int D_PIXMAP(("Copying %hux%hu rectangle at %d, %d from %ux%u desktop pixmap 0x%08x onto p.\n", width, height, x, y, pw, ph, desktop_pixmap)); XCopyArea(Xdisplay, desktop_pixmap, p, gc, x, y, width, height, 0, 0); } - if ((which != image_bg || (image_toggles & IMOPT_ITRANS)) && need_colormod(simg->iml)) { + if ((which != image_bg || (image_toggles & IMOPT_ITRANS) || images[image_bg].current != images[image_bg].norm) && need_colormod(simg->iml)) { colormod_trans(p, simg->iml, gc, width, height); } if (simg->iml->bevel != NULL) {