Enlightenment CVS committal
Author : rbdpngn
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src
Modified Files:
ewl_embed.c ewl_misc.c ewl_object.c ewl_window.c
Log Message:
Embedding EWL inside of an existing evas now works to some degree.
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_embed.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- ewl_embed.c 19 Nov 2003 20:18:34 -0000 1.15
+++ ewl_embed.c 20 Nov 2003 02:21:29 -0000 1.16
@@ -271,9 +271,12 @@
void ewl_embed_configure_cb(Ewl_Widget *w, void *ev_data, void *user_data)
{
+ Ewl_Object *o;
Ewl_Object *child;
DENTER_FUNCTION(DLEVEL_STABLE);
+
+ o = EWL_OBJECT(w);
printf("EWL Embedded Object configured at (%d, %d) and %d x %d\n",
ewl_object_get_current_x(EWL_OBJECT(w)),
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_misc.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -3 -r1.52 -r1.53
--- ewl_misc.c 19 Nov 2003 20:18:34 -0000 1.52
+++ ewl_misc.c 20 Nov 2003 02:21:29 -0000 1.53
@@ -439,12 +439,20 @@
* Configure any widgets that need it.
*/
while ((w = ewd_list_remove_first(configure_list))) {
+ if (ewl_object_get_flags(EWL_OBJECT(w),
+ EWL_FLAG_PROPERTY_TOPLEVEL)) {
+ ewl_object_request_size(EWL_OBJECT(w),
+ ewl_object_get_current_w(EWL_OBJECT(w)),
+ ewl_object_get_current_h(EWL_OBJECT(w)));
+ }
+
/*
* Remove the flag that the widget is scheduled for
* configuration.
*/
ewl_object_remove_queued(EWL_OBJECT(w),
EWL_FLAG_QUEUED_CSCHEDULED);
+
ewl_callback_call(w, EWL_CALLBACK_CONFIGURE);
}
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_object.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -3 -r1.47 -r1.48
--- ewl_object.c 20 Oct 2003 15:42:57 -0000 1.47
+++ ewl_object.c 20 Nov 2003 02:21:29 -0000 1.48
@@ -494,11 +494,11 @@
* Now bound it by the min's and max's to achieve the desired size.
*/
if (w < MINIMUM_W(o))
- CURRENT_W(o) = MINIMUM_W(o);
+ w = MINIMUM_W(o);
else if (w > MAXIMUM_W(o))
- CURRENT_W(o) = MAXIMUM_W(o);
- else
- CURRENT_W(o) = w;
+ w = MAXIMUM_W(o);
+
+ CURRENT_W(o) = w;
ewl_widget_configure(EWL_WIDGET(o));
DLEAVE_FUNCTION(DLEVEL_STABLE);
@@ -536,11 +536,11 @@
* Now bound it by the min's and max's to achieve the desired size.
*/
if (h < MINIMUM_H(o))
- CURRENT_H(o) = MINIMUM_H(o);
+ h = MINIMUM_H(o);
else if (h > MAXIMUM_H(o))
- CURRENT_H(o) = MAXIMUM_H(o);
- else
- CURRENT_H(o) = h;
+ h = MAXIMUM_H(o);
+
+ CURRENT_H(o) = h;
ewl_widget_configure(EWL_WIDGET(o));
DLEAVE_FUNCTION(DLEVEL_STABLE);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_window.c,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -3 -r1.65 -r1.66
--- ewl_window.c 19 Nov 2003 20:18:36 -0000 1.65
+++ ewl_window.c 20 Nov 2003 02:21:29 -0000 1.66
@@ -237,13 +237,6 @@
window = EWL_WINDOW(w);
o = EWL_OBJECT(w);
- /*
- * FIXME: This needs to be explored a bit, the size should come down
- * from a configure event, but need to double check.
- */
- ewl_object_request_size(EWL_OBJECT(w), ewl_object_get_current_w(o),
- ewl_object_get_current_h(o));
-
window->window = ecore_x_window_new(0, window->x, window->y,
ewl_object_get_current_w(o),
ewl_object_get_current_h(o));
-------------------------------------------------------
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive? Does it
help you create better code? SHARE THE LOVE, and help us help
YOU! Click Here: http://sourceforge.net/donate/
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
