Enlightenment CVS committal
Author : pfritz
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/lib
Modified Files:
ewl_window.c ewl_embed.c
Log Message:
fix the placement of the embed content
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_window.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -3 -r1.43 -r1.44
--- ewl_window.c 21 May 2006 03:51:41 -0000 1.43
+++ ewl_window.c 22 May 2006 19:11:37 -0000 1.44
@@ -1002,7 +1002,6 @@
void *user_data __UNUSED__)
{
Ewl_Window *win;
- Ewl_Object *child;
int width, height;
DENTER_FUNCTION(DLEVEL_STABLE);
@@ -1067,43 +1066,7 @@
0, 0); /* aspect */
}
#endif
-
- /*
- * Configure each of the child widgets.
- */
- ecore_dlist_goto_first(EWL_CONTAINER(w)->children);
- while ((child = ecore_dlist_next(EWL_CONTAINER(w)->children))) {
- int x, y;
- int size;
-
- /*
- * Try to give the child the full size of the window from it's
- * base position. The object will constrict it based on the
- * fill policy. Don't add the TOP and LEFT insets since
- * they've already been accounted for.
- */
- x = ewl_object_current_x_get(EWL_OBJECT(child));
- y = ewl_object_current_y_get(EWL_OBJECT(child));
-
- if (x < CURRENT_X(w)) {
- x = CURRENT_X(w);
- size = ewl_object_preferred_w_get(EWL_OBJECT(child));
- if (size > PREFERRED_W(w))
- ewl_object_preferred_inner_w_set(EWL_OBJECT(w),
- size);
- }
- if (y < CURRENT_Y(w)) {
- y = CURRENT_Y(w);
- size = ewl_object_preferred_h_get(EWL_OBJECT(child));
- if (size > PREFERRED_H(w))
- ewl_object_preferred_inner_h_set(EWL_OBJECT(w),
- size);
- }
-
- ewl_object_place(child, x, y, CURRENT_W(w) - (x - CURRENT_X(w)),
- CURRENT_H(w) - (y - CURRENT_Y(w)));
- }
-
+
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_embed.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -3 -r1.57 -r1.58
--- ewl_embed.c 21 May 2006 03:51:41 -0000 1.57
+++ ewl_embed.c 22 May 2006 19:11:37 -0000 1.58
@@ -1597,6 +1597,7 @@
void *user_data __UNUSED__)
{
Ewl_Embed *emb;
+ Ewl_Object *child;
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("w", w);
@@ -1608,6 +1609,42 @@
(Evas_Coord)(CURRENT_Y(w)));
evas_object_resize(emb->ev_clip, (Evas_Coord)(CURRENT_W(w)),
(Evas_Coord)(CURRENT_H(w)));
+ }
+
+ /*
+ * Configure each of the child widgets.
+ */
+ ecore_dlist_goto_first(EWL_CONTAINER(w)->children);
+ while ((child = ecore_dlist_next(EWL_CONTAINER(w)->children))) {
+ int x, y;
+ int size;
+
+ /*
+ * Try to give the child the full size of the window from it's
+ * base position. The object will constrict it based on the
+ * fill policy. Don't add the TOP and LEFT insets since
+ * they've already been accounted for.
+ */
+ x = ewl_object_current_x_get(EWL_OBJECT(child));
+ y = ewl_object_current_y_get(EWL_OBJECT(child));
+
+ if (x < CURRENT_X(w)) {
+ x = CURRENT_X(w);
+ size = ewl_object_preferred_w_get(EWL_OBJECT(child));
+ if (size > PREFERRED_W(w))
+ ewl_object_preferred_inner_w_set(EWL_OBJECT(w),
+ size);
+ }
+ if (y < CURRENT_Y(w)) {
+ y = CURRENT_Y(w);
+ size = ewl_object_preferred_h_get(EWL_OBJECT(child));
+ if (size > PREFERRED_H(w))
+ ewl_object_preferred_inner_h_set(EWL_OBJECT(w),
+ size);
+ }
+
+ ewl_object_place(child, x, y, CURRENT_W(w) - (x - CURRENT_X(w)),
+ CURRENT_H(w) - (y - CURRENT_Y(w)));
}
DLEAVE_FUNCTION(DLEVEL_STABLE);
-------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
