Enlightenment CVS committal
Author : rbdpngn
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src
Modified Files:
ewl_box.c ewl_box.h ewl_button_stock.c ewl_colorpicker.c
ewl_combo.c ewl_dialog.c ewl_filedialog.c ewl_fileselector.c
ewl_imenu.c ewl_menu.c ewl_notebook.c ewl_scrollbar.c
ewl_tree.c ewl_window.c
Log Message:
* Convert box API to EFL style.
* Fix window configure callback so that tooltips are positioned correctly.
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_box.c,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -3 -r1.70 -r1.71
--- ewl_box.c 18 Aug 2004 03:15:20 -0000 1.70
+++ ewl_box.c 19 Aug 2004 20:03:32 -0000 1.71
@@ -135,7 +135,7 @@
* that the orientation does it's job.
*/
b->orientation = 0xdeadbeef;
- ewl_box_set_orientation(b, o);
+ ewl_box_orientation_set(b, o);
DRETURN_INT(TRUE, DLEVEL_STABLE);
}
@@ -149,7 +149,7 @@
* Changes the orientation of the specified box, and
* reconfigures it in order for the appearance to be updated.
*/
-void ewl_box_set_orientation(Ewl_Box * b, Ewl_Orientation o)
+void ewl_box_orientation_set(Ewl_Box * b, Ewl_Orientation o)
{
Ewl_Widget *w;
@@ -183,7 +183,7 @@
* @return Returns the orientation value of the box @a b.
* @brief Retrieves the orientation of the box
*/
-Ewl_Orientation ewl_box_get_orientation(Ewl_Box *b)
+Ewl_Orientation ewl_box_orientation_get(Ewl_Box *b)
{
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR_RET("b", b, 0);
@@ -200,7 +200,7 @@
* Boxes use homogeneous layout by default, this can be used
* to change that.
*/
-void ewl_box_set_homogeneous(Ewl_Box *b, int h)
+void ewl_box_homogeneous_set(Ewl_Box *b, int h)
{
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("b", b);
@@ -243,7 +243,7 @@
* Adjust the spacing of the specified box and reconfigure
* it to change the appearance.
*/
-void ewl_box_set_spacing(Ewl_Box * b, int s)
+void ewl_box_spacing_set(Ewl_Box * b, int s)
{
int nodes;
Ewl_Widget *w;
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_box.h,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -3 -r1.32 -r1.33
--- ewl_box.h 21 Apr 2004 05:18:52 -0000 1.32
+++ ewl_box.h 19 Aug 2004 20:03:32 -0000 1.33
@@ -58,10 +58,10 @@
Ewl_Widget *ewl_box_new(Ewl_Orientation orientation);
int ewl_box_init(Ewl_Box * box, Ewl_Orientation orientation);
-void ewl_box_set_orientation(Ewl_Box * b, Ewl_Orientation o);
-Ewl_Orientation ewl_box_get_orientation(Ewl_Box * b);
-void ewl_box_set_spacing(Ewl_Box * b, int spacing);
-void ewl_box_set_homogeneous(Ewl_Box *b, int h);
+void ewl_box_orientation_set(Ewl_Box * b, Ewl_Orientation o);
+Ewl_Orientation ewl_box_orientation_get(Ewl_Box * b);
+void ewl_box_spacing_set(Ewl_Box * b, int spacing);
+void ewl_box_homogeneous_set(Ewl_Box *b, int h);
/*
* Internally used callbacks, override at your own risk.
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_button_stock.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- ewl_button_stock.c 18 Aug 2004 03:15:20 -0000 1.8
+++ ewl_button_stock.c 19 Aug 2004 20:03:32 -0000 1.9
@@ -98,8 +98,8 @@
/* Set the homogeneous flag to false, and add some space between image and
* label */
- ewl_box_set_homogeneous (EWL_BOX (b), FALSE);
- ewl_box_set_spacing(EWL_BOX (b), 6);
+ ewl_box_homogeneous_set(EWL_BOX (b), FALSE);
+ ewl_box_spacing_set(EWL_BOX (b), 6);
w = EWL_WIDGET(b);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_colorpicker.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- ewl_colorpicker.c 18 Aug 2004 03:15:20 -0000 1.6
+++ ewl_colorpicker.c 19 Aug 2004 20:03:32 -0000 1.7
@@ -33,7 +33,7 @@
DRETURN_INT(FALSE, DLEVEL_STABLE);
ewl_widget_appearance_set(EWL_WIDGET(cp), "colorpicker");
- ewl_box_set_spacing(EWL_BOX(cp), 20);
+ ewl_box_spacing_set(EWL_BOX(cp), 20);
/*
* Setup the larger spectrum region for selecting shades of the base
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_combo.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- ewl_combo.c 18 Aug 2004 03:15:20 -0000 1.6
+++ ewl_combo.c 19 Aug 2004 20:03:32 -0000 1.7
@@ -96,7 +96,7 @@
ewl_widget_internal_set(combo->base.popup, TRUE);
ewl_widget_layer_set(combo->base.popup, 1000);
ewl_widget_appearance_set(EWL_WIDGET(combo->base.popup), "imenu");
- ewl_box_set_orientation(EWL_BOX(combo->base.popup),
+ ewl_box_orientation_set(EWL_BOX(combo->base.popup),
EWL_ORIENTATION_VERTICAL);
ewl_object_fill_policy_set(EWL_OBJECT(combo->base.popup),
EWL_FLAG_FILL_HFILL);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_dialog.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- ewl_dialog.c 18 Aug 2004 03:15:20 -0000 1.6
+++ ewl_dialog.c 19 Aug 2004 20:03:32 -0000 1.7
@@ -64,7 +64,7 @@
if (dialog->vbox)
{
ewl_container_child_append(EWL_CONTAINER(box), dialog->vbox);
- ewl_box_set_homogeneous (EWL_BOX (dialog->vbox), FALSE);
+ ewl_box_homogeneous_set (EWL_BOX (dialog->vbox), FALSE);
switch (pos)
{
case EWL_POSITION_LEFT:
@@ -167,7 +167,7 @@
}
}
- ewl_box_set_homogeneous (EWL_BOX (dialog->action_area), FALSE);
+ ewl_box_homogeneous_set (EWL_BOX (dialog->action_area), FALSE);
ewl_widget_show (dialog->action_area);
spacer = ewl_spacer_new();
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_filedialog.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -3 -r1.38 -r1.39
--- ewl_filedialog.c 18 Aug 2004 03:15:20 -0000 1.38
+++ ewl_filedialog.c 19 Aug 2004 20:03:32 -0000 1.39
@@ -67,7 +67,7 @@
ewl_widget_show (fd->path_label);
hbox = ewl_hbox_new();
- ewl_box_set_homogeneous(EWL_BOX(hbox), FALSE);
+ ewl_box_homogeneous_set(EWL_BOX(hbox), FALSE);
ewl_widget_internal_set(hbox, TRUE);
ewl_container_child_append(EWL_CONTAINER(vbox), hbox);
ewl_widget_show (hbox);
@@ -107,7 +107,7 @@
ewl_widget_internal_set(fd->button_box, TRUE);
ewl_object_fill_policy_set(EWL_OBJECT(fd->button_box),
EWL_FLAG_FILL_HFILL | EWL_FLAG_FILL_HSHRINK);
- ewl_box_set_spacing(EWL_BOX(fd->button_box), 4);
+ ewl_box_spacing_set(EWL_BOX(fd->button_box), 4);
ewl_object_padding_set(EWL_OBJECT(fd->button_box), 10, 10, 10, 10);
ewl_object_alignment_set(EWL_OBJECT(fd->button_box), EWL_FLAG_ALIGN_RIGHT);
ewl_container_child_append(EWL_CONTAINER(vbox), fd->button_box);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_fileselector.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -3 -r1.42 -r1.43
--- ewl_fileselector.c 18 Aug 2004 03:15:20 -0000 1.42
+++ ewl_fileselector.c 19 Aug 2004 20:03:32 -0000 1.43
@@ -96,7 +96,7 @@
ewl_box_init(EWL_BOX(w), EWL_ORIENTATION_HORIZONTAL);
ewl_widget_appearance_set(w, "fileselector");
- ewl_box_set_homogeneous(EWL_BOX(w), TRUE);
+ ewl_box_homogeneous_set(EWL_BOX(w), TRUE);
ewl_object_fill_policy_set(EWL_OBJECT(w), EWL_FLAG_FILL_SHRINK |
EWL_FLAG_FILL_FILL);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_imenu.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- ewl_imenu.c 18 Aug 2004 03:15:20 -0000 1.21
+++ ewl_imenu.c 19 Aug 2004 20:03:32 -0000 1.22
@@ -53,7 +53,7 @@
ewl_widget_internal_set(menu->base.popup, TRUE);
ewl_widget_layer_set(menu->base.popup, 1000);
ewl_widget_appearance_set(EWL_WIDGET(menu->base.popup), "imenu");
- ewl_box_set_orientation(EWL_BOX(menu->base.popup),
+ ewl_box_orientation_set(EWL_BOX(menu->base.popup),
EWL_ORIENTATION_VERTICAL);
ewl_object_fill_policy_set(EWL_OBJECT(menu->base.popup),
EWL_FLAG_FILL_NONE);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_menu.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -3 -r1.22 -r1.23
--- ewl_menu.c 18 Aug 2004 03:15:20 -0000 1.22
+++ ewl_menu.c 19 Aug 2004 20:03:32 -0000 1.23
@@ -54,7 +54,7 @@
ewl_widget_internal_set(menu->base.popup, TRUE);
ewl_widget_layer_set(menu->base.popup, 1000);
ewl_widget_appearance_set(EWL_WIDGET(menu->base.popup), "menu");
- ewl_box_set_orientation(EWL_BOX(menu->base.popup),
+ ewl_box_orientation_set(EWL_BOX(menu->base.popup),
EWL_ORIENTATION_VERTICAL);
ewl_object_fill_policy_set(EWL_OBJECT(menu->base.popup),
EWL_FLAG_FILL_NONE);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_notebook.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -3 -r1.49 -r1.50
--- ewl_notebook.c 18 Aug 2004 03:15:20 -0000 1.49
+++ ewl_notebook.c 19 Aug 2004 20:03:33 -0000 1.50
@@ -472,7 +472,7 @@
switch (n->flags & EWL_POSITION_MASK) {
case EWL_POSITION_LEFT:
snprintf(file, PATH_MAX, "lnotebook");
- ewl_box_set_orientation(EWL_BOX(n->tab_box),
+ ewl_box_orientation_set(EWL_BOX(n->tab_box),
EWL_ORIENTATION_VERTICAL);
ewl_callback_append(w, EWL_CALLBACK_CONFIGURE,
ewl_notebook_configure_left_cb,
@@ -480,7 +480,7 @@
break;
case EWL_POSITION_RIGHT:
snprintf(file, PATH_MAX, "rnotebook");
- ewl_box_set_orientation(EWL_BOX(n->tab_box),
+ ewl_box_orientation_set(EWL_BOX(n->tab_box),
EWL_ORIENTATION_VERTICAL);
ewl_callback_append(w, EWL_CALLBACK_CONFIGURE,
ewl_notebook_configure_right_cb,
@@ -488,7 +488,7 @@
break;
case EWL_POSITION_BOTTOM:
snprintf(file, PATH_MAX, "bnotebook");
- ewl_box_set_orientation(EWL_BOX(n->tab_box),
+ ewl_box_orientation_set(EWL_BOX(n->tab_box),
EWL_ORIENTATION_HORIZONTAL);
ewl_callback_append(w, EWL_CALLBACK_CONFIGURE,
ewl_notebook_configure_bottom_cb,
@@ -497,7 +497,7 @@
case EWL_POSITION_TOP:
default:
snprintf(file, PATH_MAX, "tnotebook");
- ewl_box_set_orientation(EWL_BOX(n->tab_box),
+ ewl_box_orientation_set(EWL_BOX(n->tab_box),
EWL_ORIENTATION_HORIZONTAL);
ewl_callback_append(w, EWL_CALLBACK_CONFIGURE,
ewl_notebook_configure_top_cb,
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_scrollbar.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -3 -r1.34 -r1.35
--- ewl_scrollbar.c 18 Aug 2004 04:13:38 -0000 1.34
+++ ewl_scrollbar.c 19 Aug 2004 20:03:33 -0000 1.35
@@ -381,7 +381,7 @@
* Need to scroll in the opposite direction for the vertical
* scrollbar.
*/
- o = ewl_box_get_orientation(EWL_BOX(s));
+ o = ewl_box_orientation_get(EWL_BOX(s));
if (o == EWL_ORIENTATION_VERTICAL)
s->direction = -s->direction;
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_tree.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -3 -r1.53 -r1.54
--- ewl_tree.c 18 Aug 2004 04:20:09 -0000 1.53
+++ ewl_tree.c 19 Aug 2004 20:03:33 -0000 1.54
@@ -68,7 +68,7 @@
row = ewl_row_new();
for (i = 0; i < tree->ncols; i++) {
button = ewl_button_new(NULL);
- ewl_box_set_orientation(EWL_BOX(button),
+ ewl_box_orientation_set(EWL_BOX(button),
EWL_ORIENTATION_VERTICAL);
ewl_object_fill_policy_set(EWL_OBJECT(button),
EWL_FLAG_FILL_HSHRINK |
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_window.c,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -3 -r1.87 -r1.88
--- ewl_window.c 18 Aug 2004 04:55:05 -0000 1.87
+++ ewl_window.c 19 Aug 2004 20:03:33 -0000 1.88
@@ -638,14 +638,21 @@
*/
ecore_list_goto_first(EWL_CONTAINER(w)->children);
while ((child = ecore_list_next(EWL_CONTAINER(w)->children))) {
+ int x, y;
+
/*
* 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.
*/
- ewl_object_place(child, CURRENT_X(w), CURRENT_Y(w),
- CURRENT_W(w), CURRENT_H(w));
+ 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);
+ if (y < CURRENT_Y(w))
+ y = CURRENT_Y(w);
+ ewl_object_place(child, x, y, CURRENT_W(w), CURRENT_H(w));
}
DLEAVE_FUNCTION(DLEVEL_STABLE);
-------------------------------------------------------
SF.Net email is sponsored by Shop4tech.com-Lowest price on Blank Media
100pk Sonic DVD-R 4x for only $29 -100pk Sonic DVD+R for only $33
Save 50% off Retail on Ink & Toner - Free Shipping and Free Gift.
http://www.shop4tech.com/z/Inkjet_Cartridges/9_108_r285
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
