Enlightenment CVS committal

Author  : rbdpngn
Project : e17
Module  : libs/ewl

Dir     : e17/libs/ewl/src


Modified Files:
        ewl_notebook.c 


Log Message:
More notebook work.

===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_notebook.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -3 -r1.32 -r1.33
--- ewl_notebook.c      20 Oct 2003 05:05:48 -0000      1.32
+++ ewl_notebook.c      20 Oct 2003 19:54:04 -0000      1.33
@@ -547,10 +547,10 @@
        height = CURRENT_H(n) / 2;
 
        ewl_object_request_size(EWL_OBJECT(n->tab_box), width, height);
-       ewl_object_get_current_size(EWL_OBJECT(n->tab_box), &width, &height);
+       height = ewl_object_get_current_h(EWL_OBJECT(n->tab_box));
 
-       ewl_object_request_position(EWL_OBJECT(n->tab_box), CURRENT_X(w),
-                                   CURRENT_Y(w));
+       ewl_object_place(EWL_OBJECT(n->tab_box), CURRENT_X(w), CURRENT_Y(w),
+                        width, height);
        x = CURRENT_X(w);
        y = CURRENT_Y(w) + height;
        height = CURRENT_H(w) - height;
@@ -596,16 +596,14 @@
        height = CURRENT_H(n) / 2;
 
        ewl_object_request_size(EWL_OBJECT(n->tab_box), width, height);
-       ewl_object_get_current_size(EWL_OBJECT(n->tab_box), &width, &height);
+       height = ewl_object_get_current_h(EWL_OBJECT(n->tab_box));
 
-       ewl_object_request_position(EWL_OBJECT(n->tab_box), CURRENT_X(w),
-                                   CURRENT_Y(w));
        x = CURRENT_X(w);
        y = CURRENT_Y(w) + height;
        height = CURRENT_H(w) - height;
 
-       ewl_object_request_position(EWL_OBJECT(n->tab_box), CURRENT_X(w),
-                                   CURRENT_Y(w) + CURRENT_H(w) - height);
+       ewl_object_place(EWL_OBJECT(n->tab_box), CURRENT_X(w),
+                        CURRENT_Y(w) + CURRENT_H(w) - height, width, height);
        x = CURRENT_X(w);
        y = CURRENT_Y(w);
        height = CURRENT_H(w) - height;
@@ -629,14 +627,14 @@
 
        n = EWL_NOTEBOOK(w);
 
-       ewl_object_request_size(EWL_OBJECT(n->tab_box), width, height);
-       ewl_object_get_current_size(EWL_OBJECT(n->tab_box), &width, &height);
-
        width = CURRENT_W(n) / 2;
        height = CURRENT_H(n);
 
-       ewl_object_request_position(EWL_OBJECT(n->tab_box), CURRENT_X(w),
-                                   CURRENT_Y(w));
+       ewl_object_request_size(EWL_OBJECT(n->tab_box), width, height);
+       width = ewl_object_get_current_w(EWL_OBJECT(n->tab_box));
+
+       ewl_object_place(EWL_OBJECT(n->tab_box), CURRENT_X(w), CURRENT_Y(w),
+                        width, height);
        x = CURRENT_X(w) + width;
        y = CURRENT_Y(w);
        width = CURRENT_W(w) - width;
@@ -658,15 +656,15 @@
 
        n = EWL_NOTEBOOK(w);
 
-       ewl_object_request_size(EWL_OBJECT(n->tab_box), width, height);
-       ewl_object_get_current_size(EWL_OBJECT(n->tab_box), &width, &height);
-
        width = CURRENT_W(n) / 2;
        height = CURRENT_H(n);
 
-       ewl_object_request_position(EWL_OBJECT(n->tab_box),
-                                   CURRENT_X(w) + CURRENT_W(w) - width,
-                                   CURRENT_Y(w));
+       ewl_object_request_size(EWL_OBJECT(n->tab_box), width, height);
+       width = ewl_object_get_current_w(EWL_OBJECT(n->tab_box));
+
+       ewl_object_place(EWL_OBJECT(n->tab_box),
+                        CURRENT_X(w) + CURRENT_W(w) - width, CURRENT_Y(w),
+                        width, height);
        x = CURRENT_X(w);
        y = CURRENT_Y(w);
        width = CURRENT_W(w) - width;




-------------------------------------------------------
This SF.net email is sponsored by OSDN developer relations
Here's your chance to show off your extensive product knowledge
We want to know what you know. Tell us and you have a chance to win $100
http://www.zoomerang.com/survey.zgi?HRPT1X3RYQNC5V4MLNSV3E54
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to