Enlightenment CVS committal
Author : rbdpngn
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src
Modified Files:
ewl_object.c ewl_scrollpane.c
Log Message:
Missed a case in the object sizing code for the initial request.
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_object.c,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -3 -r1.50 -r1.51
--- ewl_object.c 26 Feb 2004 05:38:36 -0000 1.50
+++ ewl_object.c 9 Apr 2004 06:15:31 -0000 1.51
@@ -495,7 +495,7 @@
* Bound the width by the preferred size first.
*/
if ((w < o->preferred.w && !(o->flags & EWL_FLAG_FILL_HSHRINK))
- || (w > o->preferred.w &&
+ || (o->preferred.w && w > o->preferred.w &&
!(o->flags & EWL_FLAG_FILL_HFILL)))
w = o->preferred.w;
@@ -537,7 +537,7 @@
* Bound the width by the preferred size first.
*/
if ((h < o->preferred.h && !(o->flags & EWL_FLAG_FILL_VSHRINK))
- || (h > o->preferred.h &&
+ || (o->preferred.h && h > o->preferred.h &&
!(o->flags & EWL_FLAG_FILL_VFILL)))
h = o->preferred.h;
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_scrollpane.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -3 -r1.35 -r1.36
--- ewl_scrollpane.c 6 Apr 2004 05:28:04 -0000 1.35
+++ ewl_scrollpane.c 9 Apr 2004 06:15:32 -0000 1.36
@@ -43,8 +43,7 @@
ewl_container_resize_notify(EWL_CONTAINER(s),
(Ewl_Child_Resize)
ewl_scrollpane_child_resize_cb);
- ewl_object_set_fill_policy(EWL_OBJECT(s), EWL_FLAG_FILL_FILL |
- EWL_FLAG_FILL_SHRINK);
+ ewl_object_set_fill_policy(EWL_OBJECT(s), EWL_FLAG_FILL_ALL);
s->overlay = ewl_overlay_new();
ewl_object_set_fill_policy(EWL_OBJECT(s->overlay), EWL_FLAG_FILL_ALL);
-------------------------------------------------------
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470&alloc_id=3638&op=click
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
