Enlightenment CVS committal
Author : rbdpngn
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src
Modified Files:
ewl_paned.c
Log Message:
Adjustments to the paned widget layout.
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_paned.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- ewl_paned.c 7 Sep 2004 15:27:28 -0000 1.2
+++ ewl_paned.c 7 Sep 2004 15:49:00 -0000 1.3
@@ -59,6 +59,7 @@
p->first = EWL_BOX(ewl_vbox_new());
ewl_container_child_append(EWL_CONTAINER(p), EWL_WIDGET(p->first));
+ ewl_object_fill_policy_set(EWL_OBJECT(p->first), EWL_FLAG_FILL_NONE);
ewl_widget_show(EWL_WIDGET(p->first));
if (orient == EWL_ORIENTATION_HORIZONTAL)
@@ -82,6 +83,7 @@
p->second = EWL_BOX(ewl_vbox_new());
ewl_container_child_append(EWL_CONTAINER(p), EWL_WIDGET(p->second));
+ ewl_object_fill_policy_set(EWL_OBJECT(p->second), EWL_FLAG_FILL_NONE);
ewl_widget_show(EWL_WIDGET(p->second));
ewl_widget_internal_set(EWL_WIDGET(p->first), TRUE);
@@ -262,26 +264,22 @@
if (p->orientation == EWL_ORIENTATION_HORIZONTAL) {
int x = mm->x;
- if (x < EWL_OBJECT_MIN_SIZE)
- x = EWL_OBJECT_MIN_SIZE;
- else if (x > EWL_OBJECT_MAX_SIZE)
- x = EWL_OBJECT_MAX_SIZE;
-
- ewl_object_x_request(EWL_OBJECT(p->grabber), x);
- ewl_object_w_request(EWL_OBJECT(p->first), x);
+ // ewl_object_x_request(EWL_OBJECT(p->grabber), x);
+ if (mm->x > CURRENT_X(p) && mm->x < CURRENT_X(p) + CURRENT_W(p))
+ ewl_object_preferred_inner_w_set(EWL_OBJECT(p->first),
+ x);
} else {
int y = mm->y;
- if (y < EWL_OBJECT_MIN_SIZE)
- y = EWL_OBJECT_MIN_SIZE;
- else if (y > EWL_OBJECT_MAX_SIZE)
- y = EWL_OBJECT_MAX_SIZE;
-
- ewl_object_y_request(EWL_OBJECT(p->grabber), y);
- ewl_object_h_request(EWL_OBJECT(p->first), y);
+ // ewl_object_y_request(EWL_OBJECT(p->grabber), y);
+ if (mm->y > CURRENT_Y(p) && mm->y < CURRENT_Y(p) + CURRENT_H(p))
+ ewl_object_preferred_inner_h_set(EWL_OBJECT(p->first),
+ y);
}
+ ewl_widget_configure(p);
+
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
-------------------------------------------------------
This SF.Net email is sponsored by BEA Weblogic Workshop
FREE Java Enterprise J2EE developer tools!
Get your free copy of BEA WebLogic Workshop 8.1 today.
http://ads.osdn.com/?ad_id=5047&alloc_id=10808&op=click
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
