Enlightenment CVS committal

Author  : rbdpngn
Project : e17
Module  : libs/ewl

Dir     : e17/libs/ewl/src/lib


Modified Files:
        ewl_image.c 


Log Message:
Use the scaled size when realizing the image widget.

===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_image.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- ewl_image.c 22 Mar 2005 20:58:17 -0000      1.2
+++ ewl_image.c 26 Mar 2005 05:25:20 -0000      1.3
@@ -319,18 +319,17 @@
 
        if (!i->ow)
                i->ow = 256;
-       else
-               ewl_object_preferred_inner_w_set(EWL_OBJECT(i), i->ow);
        if (!i->oh)
                i->oh = 256;
-       else
-               ewl_object_preferred_inner_h_set(EWL_OBJECT(i), i->oh);
 
-       if (ewl_object_preferred_w_get(EWL_OBJECT(i)))
+       if (ewl_object_preferred_w_get(EWL_OBJECT(i)) == EWL_OBJECT_MIN_SIZE) {
+               ewl_object_preferred_inner_w_set(EWL_OBJECT(i), i->ow);
+               ewl_object_preferred_inner_h_set(EWL_OBJECT(i), i->oh);
+               ewl_image_scale(i, i->sw, i->sh);
+       }
+       else
                ewl_image_scale_to(i, ewl_object_preferred_w_get(EWL_OBJECT(i)),
                                ewl_object_preferred_h_get(EWL_OBJECT(i)));
-       else
-               ewl_image_scale(i, i->sw, i->sh);
 
        DLEAVE_FUNCTION(DLEVEL_STABLE);
 }




-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to