summaryrefslogtreecommitdiffstats
path: root/kdecore
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-15 08:41:49 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-15 08:41:49 +0000
commit9a0fbb0a9655eff64fa2c2004dbf8f9d7a96b5b3 (patch)
tree10db24688050b256b5edf97020df6b92a593f8ad /kdecore
parente436bd2166d6af00e96dc9a254bc4abac7f1eccf (diff)
downloadtdelibs-9a0fbb0a9655eff64fa2c2004dbf8f9d7a96b5b3.tar.gz
tdelibs-9a0fbb0a9655eff64fa2c2004dbf8f9d7a96b5b3.zip
Added convertToPremultipliedAlpha() to KImageEffect
Fixed "glowing icons" when 32 bit ARGB visuals are in use git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1247329 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kdecore')
-rw-r--r--kdecore/kiconloader.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/kdecore/kiconloader.cpp b/kdecore/kiconloader.cpp
index bd1ad3a91..62950e5d8 100644
--- a/kdecore/kiconloader.cpp
+++ b/kdecore/kiconloader.cpp
@@ -51,6 +51,8 @@
#include "svgicons/ksvgiconpainter.h"
#endif
+#include <kimageeffect.h>
+
#include "kiconloader_p.h"
/*** KIconThemeNode: A node in the icon theme dependancy tree. ***/
@@ -855,7 +857,8 @@ TQPixmap KIconLoader::loadIcon(const TQString& _name, KIcon::Group group, int si
}
}
- pix.convertFromImage(*img);
+ if (TQPaintDevice::x11AppDepth() == 32) pix.convertFromImage(KImageEffect::convertToPremultipliedAlpha( *img ));
+ else pix.convertFromImage(*img);
delete img;