Enlightenment CVS committal
Author : ningerso
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/lib
Modified Files:
ewl_object.c
Log Message:
Eliminate old sanity checks on the current preferred size that are no longer
necessary and were causing unexpected sizing issues.
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_object.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- ewl_object.c 13 Mar 2006 18:14:14 -0000 1.12
+++ ewl_object.c 12 Apr 2006 06:13:58 -0000 1.13
@@ -1,7 +1,7 @@
+#include "ewl_private.h"
#include <Ewl.h>
#include "ewl_debug.h"
#include "ewl_macros.h"
-#include "ewl_private.h"
/**
* @param o: the object to initialize
@@ -562,8 +562,7 @@
* Bound the width by the preferred size first.
*/
if ((w < o->preferred.w && !(o->flags & EWL_FLAG_FILL_HSHRINK))
- || (o->preferred.w && w > o->preferred.w &&
- !(o->flags & EWL_FLAG_FILL_HFILL)))
+ || (w > o->preferred.w && !(o->flags & EWL_FLAG_FILL_HFILL)))
w = o->preferred.w;
/*
@@ -603,8 +602,7 @@
* Bound the width by the preferred size first.
*/
if ((h < o->preferred.h && !(o->flags & EWL_FLAG_FILL_VSHRINK))
- || (o->preferred.h && h > o->preferred.h &&
- !(o->flags & EWL_FLAG_FILL_VFILL)))
+ || (h > o->preferred.h && !(o->flags & EWL_FLAG_FILL_VFILL)))
h = o->preferred.h;
/*
-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
