Enlightenment CVS committal
Author : rbdpngn
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/lib
Modified Files:
ewl_overlay.c ewl_widget.c
Log Message:
Fixup positioning on realize to compensate for loaded padding and insets.
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_overlay.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- ewl_overlay.c 25 Apr 2005 05:44:19 -0000 1.4
+++ ewl_overlay.c 20 May 2005 05:02:59 -0000 1.5
@@ -98,8 +98,9 @@
DENTER_FUNCTION(DLEVEL_STABLE);
- size = ewl_object_current_x_get(EWL_OBJECT(child)) +
- ewl_object_preferred_w_get(EWL_OBJECT(child)) - CURRENT_X(o);
+ size = ewl_object_current_x_get(EWL_OBJECT(child));
+ size += ewl_object_preferred_w_get(EWL_OBJECT(child));
+ size -= CURRENT_X(o);
if (size > PREFERRED_W(o))
ewl_object_preferred_inner_w_set(EWL_OBJECT(o), size);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_widget.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- ewl_widget.c 13 May 2005 03:26:13 -0000 1.5
+++ ewl_widget.c 20 May 2005 05:02:59 -0000 1.6
@@ -155,7 +155,7 @@
DCHECK_PARAM_PTR_RET("name", name, NULL);
if (name_table)
- match = ecore_hash_get(name_table, name);
+ match = EWL_WIDGET(ecore_hash_get(name_table, (void *)name));
DRETURN_PTR(match, DLEVEL_STABLE);
}
@@ -1217,6 +1217,11 @@
ewl_object_insets_set(EWL_OBJECT(w), i_l, i_r, i_t, i_b);
ewl_object_padding_set(EWL_OBJECT(w), p_l, p_r, p_t, p_b);
+ i_l = CURRENT_X(w);
+ i_t = CURRENT_Y(w);
+ ewl_object_x_request(EWL_OBJECT(w), i_l);
+ ewl_object_y_request(EWL_OBJECT(w), i_t);
+
if (ewl_object_state_has(EWL_OBJECT(w),
EWL_FLAG_STATE_DISABLED))
edje_object_signal_emit(w->theme_object, "disabled",
-------------------------------------------------------
This SF.Net email is sponsored by Oracle Space Sweepstakes
Want to be the first software developer in space?
Enter now for the Oracle Space Sweepstakes!
http://ads.osdn.com/?ad_id=7412&alloc_id=16344&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
