Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
iclass.c
Log Message:
Fix pseudotransparent iconbox on desk with no background.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/iclass.c,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -3 -r1.87 -r1.88
--- iclass.c 7 Jan 2006 07:20:58 -0000 1.87
+++ iclass.c 14 Jan 2006 15:17:57 -0000 1.88
@@ -963,6 +963,7 @@
{
Imlib_Image *bg;
int flags;
+ int ww, hh;
if (!im)
return NULL;
@@ -972,21 +973,21 @@
if (flags != ICLASS_ATTR_OPAQUE)
{
bg = pt_get_bg_image(win, w, h, flags & ICLASS_ATTR_GLASS);
- pt_blend(bg, im, flags & ICLASS_ATTR_USE_CM);
+ if (bg)
+ {
+ pt_blend(bg, im, flags & ICLASS_ATTR_USE_CM);
+ return bg;
+ }
}
- else
#else
flags = image_type;
win = None;
#endif
- {
- int ww, hh;
- imlib_context_set_image(im);
- ww = imlib_image_get_width();
- hh = imlib_image_get_height();
- bg = imlib_create_cropped_scaled_image(0, 0, ww, hh, w, h);
- }
+ imlib_context_set_image(im);
+ ww = imlib_image_get_width();
+ hh = imlib_image_get_height();
+ bg = imlib_create_cropped_scaled_image(0, 0, ww, hh, w, h);
return bg;
}
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
