Enlightenment CVS committal
Author : lordchaos
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/lib
Modified Files:
ewl_overlay.c
Log Message:
* Rollback this change until we can find a better solution
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_overlay.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- ewl_overlay.c 12 Jan 2006 18:21:19 -0000 1.11
+++ ewl_overlay.c 24 Jan 2006 12:19:26 -0000 1.12
@@ -45,8 +45,8 @@
if (!ewl_container_init(EWL_CONTAINER(w)))
DRETURN_INT(FALSE, DLEVEL_STABLE);
- ewl_widget_appearance_set(EWL_WIDGET(w), EWL_OVERLAY_TYPE);
- ewl_widget_inherit(EWL_WIDGET(w), EWL_OVERLAY_TYPE);
+ ewl_widget_appearance_set(EWL_WIDGET(w), "overlay");
+ ewl_widget_inherit(EWL_WIDGET(w), "overlay");
ewl_container_show_notify_set(EWL_CONTAINER(w),
ewl_overlay_child_show_cb);
ewl_container_resize_notify_set(EWL_CONTAINER(w),
@@ -73,7 +73,7 @@
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("w", w);
- DCHECK_TYPE("w", w, EWL_WIDGET_TYPE);
+ DCHECK_TYPE("w", w, "widget");
o = EWL_OBJECT(w);
@@ -89,10 +89,10 @@
* fill policy. Don't add the TOP and LEFT insets since
* they've already been accounted for.
*/
- width = ewl_object_current_x_get(child) + CURRENT_W(w);
- width -= CURRENT_X(w);
- height = ewl_object_current_y_get(child) + CURRENT_H(w);
- height -= CURRENT_Y(w);
+ width = CURRENT_W(w) + CURRENT_X(w);
+ width -= ewl_object_current_x_get(child);
+ height = CURRENT_H(w) + CURRENT_Y(w);
+ height -= ewl_object_current_y_get(child);
ewl_object_size_request(child, width, height);
}
@@ -107,8 +107,8 @@
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("o", o);
DCHECK_PARAM_PTR("child", child);
- DCHECK_TYPE("o", o, EWL_CONTAINER_TYPE);
- DCHECK_TYPE("child", child, EWL_WIDGET_TYPE);
+ DCHECK_TYPE("o", o, "container");
+ DCHECK_TYPE("child", child, "widget");
size = ewl_object_current_x_get(EWL_OBJECT(child));
size += ewl_object_preferred_w_get(EWL_OBJECT(child));
@@ -116,9 +116,8 @@
if (size > PREFERRED_W(o))
ewl_object_preferred_inner_w_set(EWL_OBJECT(o), size);
- size = ewl_object_current_y_get(EWL_OBJECT(child));
- size += ewl_object_preferred_h_get(EWL_OBJECT(child));
- size -= CURRENT_Y(o);
+ size = ewl_object_current_y_get(EWL_OBJECT(child)) +
+ ewl_object_preferred_h_get(EWL_OBJECT(child)) - CURRENT_Y(o);
if (size > PREFERRED_H(o))
ewl_object_preferred_inner_h_set(EWL_OBJECT(o), size);
@@ -136,8 +135,8 @@
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("c", c);
DCHECK_PARAM_PTR("w", w);
- DCHECK_TYPE("c", c, EWL_CONTAINER_TYPE);
- DCHECK_TYPE("w", w, EWL_WIDGET_TYPE);
+ DCHECK_TYPE("c", c, "container");
+ DCHECK_TYPE("w", w, "widget");
child = EWL_OBJECT(w);
overlay = EWL_OVERLAY(c);
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
