Enlightenment CVS committal
Author : werkt
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src
Modified Files:
ewl_box.c ewl_cell.c ewl_container.c ewl_entry.c
ewl_filedialog.c ewl_fileselector.c ewl_grid.c ewl_image.c
ewl_menu_base.c ewl_notebook.c ewl_object.c ewl_object.h
ewl_overlay.c ewl_progressbar.c ewl_row.c ewl_scrollpane.c
ewl_seeker.c ewl_selectionbar.c ewl_spinner.c ewl_tree.c
Log Message:
Moved get_preferred_* to get_preferred_sum_* and made a get_preferred_* set
which is orthogonal to set_preferred_*
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_box.c,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -3 -r1.65 -r1.66
--- ewl_box.c 21 Apr 2004 05:18:52 -0000 1.65
+++ ewl_box.c 11 Aug 2004 01:25:59 -0000 1.66
@@ -679,13 +679,13 @@
*/
if (EWL_BOX(c)->orientation == EWL_ORIENTATION_HORIZONTAL) {
size = PREFERRED_W(c) +
- ewl_object_get_preferred_w(EWL_OBJECT(w)) + space;
+ ewl_object_preferred_w_sum_get(EWL_OBJECT(w)) + space;
ewl_object_set_preferred_w(EWL_OBJECT(c), size);
ewl_container_prefer_largest(c, EWL_ORIENTATION_VERTICAL);
}
else {
size = PREFERRED_H(c) +
- ewl_object_get_preferred_h(EWL_OBJECT(w)) + space;
+ ewl_object_preferred_h_sum_get(EWL_OBJECT(w)) + space;
ewl_object_set_preferred_h(EWL_OBJECT(c), size);
ewl_container_prefer_largest(c, EWL_ORIENTATION_HORIZONTAL);
}
@@ -733,7 +733,7 @@
if (b->orientation == EWL_ORIENTATION_HORIZONTAL) {
ewl_object_set_preferred_w(EWL_OBJECT(c),
PREFERRED_W(c) -
- ewl_object_get_preferred_w(EWL_OBJECT(w)) -
+ ewl_object_preferred_w_sum_get(EWL_OBJECT(w)) -
space);
ewl_container_prefer_largest(c, EWL_ORIENTATION_VERTICAL);
@@ -741,7 +741,7 @@
else {
ewl_object_set_preferred_h(EWL_OBJECT(c),
PREFERRED_H(c) -
- ewl_object_get_preferred_h(EWL_OBJECT(w)) -
+ ewl_object_preferred_h_sum_get(EWL_OBJECT(w)) -
space);
ewl_container_prefer_largest(c, EWL_ORIENTATION_HORIZONTAL);
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_cell.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- ewl_cell.c 24 Mar 2004 04:11:09 -0000 1.13
+++ ewl_cell.c 11 Aug 2004 01:25:59 -0000 1.14
@@ -86,8 +86,8 @@
}
ewl_object_set_preferred_size(EWL_OBJECT(c),
- ewl_object_get_preferred_w(EWL_OBJECT(w)),
- ewl_object_get_preferred_h(EWL_OBJECT(w)));
+ ewl_object_preferred_w_sum_get(EWL_OBJECT(w)),
+ ewl_object_preferred_h_sum_get(EWL_OBJECT(w)));
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
@@ -99,8 +99,8 @@
DENTER_FUNCTION(DLEVEL_STABLE);
ewl_object_set_preferred_size(EWL_OBJECT(c),
- ewl_object_get_preferred_w(EWL_OBJECT(w)),
- ewl_object_get_preferred_h(EWL_OBJECT(w)));
+ ewl_object_preferred_w_sum_get(EWL_OBJECT(w)),
+ ewl_object_preferred_h_sum_get(EWL_OBJECT(w)));
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_container.c,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -3 -r1.70 -r1.71
--- ewl_container.c 24 Jun 2004 02:17:08 -0000 1.70
+++ ewl_container.c 11 Aug 2004 01:25:59 -0000 1.71
@@ -663,11 +663,11 @@
DCHECK_PARAM_PTR("c", c);
if (o == EWL_ORIENTATION_HORIZONTAL) {
- get_size = ewl_object_get_preferred_w;
+ get_size = ewl_object_preferred_w_sum_get;
set_size = ewl_object_set_preferred_w;
}
else {
- get_size = ewl_object_get_preferred_h;
+ get_size = ewl_object_preferred_h_sum_get;
set_size = ewl_object_set_preferred_h;
}
@@ -701,11 +701,11 @@
DCHECK_PARAM_PTR("c", c);
if (o == EWL_ORIENTATION_HORIZONTAL) {
- get_size = ewl_object_get_preferred_w;
+ get_size = ewl_object_preferred_w_sum_get;
set_size = ewl_object_set_preferred_w;
}
else {
- get_size = ewl_object_get_preferred_h;
+ get_size = ewl_object_preferred_h_sum_get;
set_size = ewl_object_set_preferred_h;
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_entry.c,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -3 -r1.93 -r1.94
--- ewl_entry.c 30 Jul 2004 14:42:47 -0000 1.93
+++ ewl_entry.c 11 Aug 2004 01:25:59 -0000 1.94
@@ -791,8 +791,8 @@
if (e->text == w) {
ewl_object_set_preferred_size(EWL_OBJECT(c),
- ewl_object_get_preferred_w(EWL_OBJECT(w)),
- ewl_object_get_preferred_h(EWL_OBJECT(w)));
+ ewl_object_preferred_w_sum_get(EWL_OBJECT(w)),
+ ewl_object_preferred_h_sum_get(EWL_OBJECT(w)));
}
DLEAVE_FUNCTION(DLEVEL_STABLE);
@@ -813,10 +813,10 @@
if (o == EWL_ORIENTATION_HORIZONTAL)
ewl_object_set_preferred_w(EWL_OBJECT(entry),
- ewl_object_get_preferred_w(text));
+ ewl_object_preferred_w_sum_get(text));
else
ewl_object_set_preferred_h(EWL_OBJECT(entry),
- ewl_object_get_preferred_h(text));
+ ewl_object_preferred_h_sum_get(text));
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_filedialog.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -3 -r1.34 -r1.35
--- ewl_filedialog.c 13 May 2004 06:03:00 -0000 1.34
+++ ewl_filedialog.c 11 Aug 2004 01:25:59 -0000 1.35
@@ -166,7 +166,6 @@
i = stat (path, &statbuf);
if (!i && S_ISDIR(statbuf.st_mode)) {
- printf ("Changing path to: %s\n", path);
ewl_fileselector_set_directory (EWL_FILESELECTOR (fs), path);
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_fileselector.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -3 -r1.37 -r1.38
--- ewl_fileselector.c 15 Jul 2004 03:23:12 -0000 1.37
+++ ewl_fileselector.c 11 Aug 2004 01:25:59 -0000 1.38
@@ -81,6 +81,7 @@
void ewl_fileselector_init(Ewl_Fileselector * fs)
{
Ewl_Widget *w;
+ char *home;
char *head_dirs[1] = {
"Directories"
};
@@ -116,6 +117,10 @@
ewl_callback_append(w, EWL_CALLBACK_CONFIGURE,
ewl_fileselector_configure_cb, NULL);
+ home = getenv("HOME");
+
+ if (home)
+ ewl_fileselector_set_directory(fs, home);
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
@@ -146,16 +151,11 @@
void ewl_fileselector_realize_cb(Ewl_Widget * w, void *ev_data, void *user_data)
{
Ewl_Fileselector *fs;
- char *home;
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("w", w);
fs = EWL_FILESELECTOR(w);
- home = getenv("HOME");
-
- if (home)
- ewl_fileselector_set_directory(fs, home);
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_grid.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- ewl_grid.c 24 Mar 2004 04:11:09 -0000 1.18
+++ ewl_grid.c 11 Aug 2004 01:25:59 -0000 1.19
@@ -534,7 +534,7 @@
* Calculate the amount of space the widget would need in this
* column.
*/
- temp = ewl_object_get_preferred_w(EWL_OBJECT(c)) /
+ temp = ewl_object_preferred_w_sum_get(EWL_OBJECT(c)) /
(cdata->end_col - cdata->start_col + 1);
/*
@@ -566,7 +566,7 @@
* Calculate the amount of space the widget would need in this
* row.
*/
- temp = ewl_object_get_preferred_h(EWL_OBJECT(c)) /
+ temp = ewl_object_preferred_h_sum_get(EWL_OBJECT(c)) /
(cdata->end_row - cdata->start_row + 1);
/*
@@ -613,12 +613,12 @@
info = g->col_size;
start_off = cdata->start_col;
end_off = cdata->end_col;
- widget_size = ewl_object_get_preferred_w;
+ widget_size = ewl_object_preferred_w_sum_get;
} else {
info = g->row_size;
start_off = cdata->start_row;
end_off = cdata->end_row;
- widget_size = ewl_object_get_preferred_h;
+ widget_size = ewl_object_preferred_h_sum_get;
}
/*
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_image.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -3 -r1.46 -r1.47
--- ewl_image.c 30 Jul 2004 23:33:06 -0000 1.46
+++ ewl_image.c 11 Aug 2004 01:25:59 -0000 1.47
@@ -294,9 +294,9 @@
else
ewl_object_set_preferred_h(EWL_OBJECT(i), i->oh);
- if (ewl_object_get_preferred_w(EWL_OBJECT(i)))
- ewl_image_scale_to(i, ewl_object_get_preferred_w(EWL_OBJECT(i)),
- ewl_object_get_preferred_h(EWL_OBJECT(i)));
+ if (ewl_object_preferred_w_sum_get(EWL_OBJECT(i)))
+ ewl_image_scale_to(i, ewl_object_preferred_w_sum_get(EWL_OBJECT(i)),
+ ewl_object_preferred_h_sum_get(EWL_OBJECT(i)));
else
ewl_image_scale(i, i->sw, i->sh);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_menu_base.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -3 -r1.32 -r1.33
--- ewl_menu_base.c 27 Jul 2004 13:55:42 -0000 1.32
+++ ewl_menu_base.c 11 Aug 2004 01:25:59 -0000 1.33
@@ -297,7 +297,7 @@
while ((child = ecore_list_next(c->children))) {
int width;
- width = ewl_object_get_preferred_w(EWL_OBJECT(child));
+ width = ewl_object_preferred_w_sum_get(EWL_OBJECT(child));
ewl_object_place(EWL_OBJECT(child), x, CURRENT_Y(w), width,
CURRENT_H(w));
x += width;
@@ -312,7 +312,7 @@
ewl_container_prefer_largest(parent, EWL_ORIENTATION_VERTICAL);
ewl_object_set_preferred_w(EWL_OBJECT(parent), PREFERRED_W(parent) +
- ewl_object_get_preferred_w(EWL_OBJECT(child)));
+ ewl_object_preferred_w_sum_get(EWL_OBJECT(child)));
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_notebook.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -3 -r1.45 -r1.46
--- ewl_notebook.c 24 Mar 2004 04:11:09 -0000 1.45
+++ ewl_notebook.c 11 Aug 2004 01:25:59 -0000 1.46
@@ -795,7 +795,7 @@
if (VISIBLE(n->tab_box))
ewl_object_set_preferred_w(EWL_OBJECT(c),
PREFERRED_W(c) +
- ewl_object_get_preferred_w(
+ ewl_object_preferred_w_sum_get(
EWL_OBJECT(n->tab_box)));
}
else {
@@ -809,7 +809,7 @@
if (VISIBLE(n->tab_box))
ewl_object_set_preferred_h(EWL_OBJECT(c),
PREFERRED_H(c) +
- ewl_object_get_preferred_w(
+ ewl_object_preferred_w_sum_get(
EWL_OBJECT(n->tab_box)));
}
@@ -840,7 +840,7 @@
if (VISIBLE(n->tab_box))
ewl_object_set_preferred_w(EWL_OBJECT(c),
PREFERRED_W(c) +
- ewl_object_get_preferred_w(
+ ewl_object_preferred_w_sum_get(
EWL_OBJECT(n->tab_box)));
}
else {
@@ -854,7 +854,7 @@
if (VISIBLE(n->tab_box))
ewl_object_set_preferred_h(EWL_OBJECT(c),
PREFERRED_H(c) +
- ewl_object_get_preferred_w(
+ ewl_object_preferred_w_sum_get(
EWL_OBJECT(n->tab_box)));
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_object.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -3 -r1.53 -r1.54
--- ewl_object.c 30 Jul 2004 23:33:06 -0000 1.53
+++ ewl_object.c 11 Aug 2004 01:25:59 -0000 1.54
@@ -303,14 +303,14 @@
* Stores the width and height of object @a o into @a w and @a h
* respectively.
*/
-void ewl_object_get_preferred_size(Ewl_Object * o, int *w, int *h)
+void ewl_object_preferred_size_sum_get(Ewl_Object * o, int *w, int *h)
{
DCHECK_PARAM_PTR("o", o);
if (w)
- *w = ewl_object_get_preferred_w(o);
+ *w = ewl_object_preferred_w_sum_get(o);
if (h)
- *h = ewl_object_get_preferred_h(o);
+ *h = ewl_object_preferred_h_sum_get(o);
}
/**
@@ -318,7 +318,7 @@
* @return Returns the preferred width of the object @a o.
* @brief Get the preferred width of the object
*/
-int ewl_object_get_preferred_w(Ewl_Object * o)
+int ewl_object_preferred_w_sum_get(Ewl_Object * o)
{
int add, temp;
@@ -344,7 +344,7 @@
* @return Returns the preferred height of the object.
* @brief Get the preferred height of the object
*/
-int ewl_object_get_preferred_h(Ewl_Object * o)
+int ewl_object_preferred_h_sum_get(Ewl_Object * o)
{
int add, temp;
@@ -366,6 +366,70 @@
}
/**
+ * @param o: the object to retrieve size information
+ * @param w: a pointer to the integer to store the width of the object
+ * @param h: a pointer to the integer to store the height of the object
+ * @return Returns no value.
+ * @brief Retrieve the preferred size of an object
+ *
+ * Stores the width and height of object @a o into @a w and @a h
+ * respectively, without the insets and padding added.
+ */
+void ewl_object_preferred_size_get(Ewl_Object * o, int *w, int *h)
+{
+ DCHECK_PARAM_PTR("o", o);
+
+ if (w)
+ *w = ewl_object_preferred_w_get(o);
+ if (h)
+ *h = ewl_object_preferred_h_get(o);
+}
+
+/**
+ * @param o: the object to retrieve the preferred width
+ * @return Returns the preferred width of the object @a o.
+ * @brief Get the preferred width of the object, ignoring padding and insets
+ */
+int ewl_object_preferred_w_get(Ewl_Object * o)
+{
+ int temp;
+
+ DENTER_FUNCTION(DLEVEL_STABLE);
+ DCHECK_PARAM_PTR_RET("o", o, 0);
+
+ if (PREFERRED_W(o) < MINIMUM_W(o))
+ temp = MINIMUM_W(o);
+ else if (PREFERRED_W(o) > MAXIMUM_W(o))
+ temp = MAXIMUM_W(o);
+ else
+ temp = PREFERRED_W(o);
+
+ DRETURN_INT(temp, DLEVEL_STABLE);
+}
+
+/**
+ * @param o: the object to retrieve the preferred height
+ * @return Returns the preferred height of the object.
+ * @brief Get the preferred height of the object
+ */
+int ewl_object_preferred_h_get(Ewl_Object * o)
+{
+ int temp;
+
+ DENTER_FUNCTION(DLEVEL_STABLE);
+ DCHECK_PARAM_PTR_RET("o", o, 0);
+
+ if (PREFERRED_H(o) < MINIMUM_H(o))
+ temp = MINIMUM_H(o);
+ else if (PREFERRED_H(o) > MAXIMUM_H(o))
+ temp = MAXIMUM_H(o);
+ else
+ temp = PREFERRED_H(o);
+
+ DRETURN_INT(temp, DLEVEL_STABLE);
+}
+
+/**
* @param o: the object to request a new size
* @param x: the x coordinate to request be applied to the object
* @param y: the y coordinate to request be applied to the object
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_object.h,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -3 -r1.41 -r1.42
--- ewl_object.h 21 Jul 2004 18:59:21 -0000 1.41
+++ ewl_object.h 11 Aug 2004 01:25:59 -0000 1.42
@@ -102,11 +102,14 @@
int ewl_object_get_current_h(Ewl_Object * o);
void ewl_object_set_preferred_size(Ewl_Object * o, int w, int h);
-void ewl_object_get_preferred_size(Ewl_Object * o, int *w, int *h);
+void ewl_object_preferred_size_sum_get(Ewl_Object * o, int *w, int *h);
+void ewl_object_preferred_size_get(Ewl_Object * o, int *w, int *h);
void ewl_object_set_preferred_w(Ewl_Object * o, int w);
-int ewl_object_get_preferred_w(Ewl_Object * o);
+int ewl_object_preferred_w_sum_get(Ewl_Object * o);
+int ewl_object_preferred_w_get(Ewl_Object * o);
void ewl_object_set_preferred_h(Ewl_Object * o, int h);
-int ewl_object_get_preferred_h(Ewl_Object * o);
+int ewl_object_preferred_h_sum_get(Ewl_Object * o);
+int ewl_object_preferred_h_get(Ewl_Object * o);
void ewl_object_request_geometry(Ewl_Object * o, int x, int y,
int w, int h);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_overlay.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- ewl_overlay.c 21 Apr 2004 05:18:52 -0000 1.5
+++ ewl_overlay.c 11 Aug 2004 01:25:59 -0000 1.6
@@ -94,12 +94,12 @@
DENTER_FUNCTION(DLEVEL_STABLE);
size = ewl_object_get_current_x(EWL_OBJECT(child)) +
- ewl_object_get_preferred_w(EWL_OBJECT(child)) - CURRENT_X(o);
+ ewl_object_preferred_w_sum_get(EWL_OBJECT(child)) - CURRENT_X(o);
if (size > PREFERRED_W(o))
ewl_object_set_preferred_w(EWL_OBJECT(o), size);
size = ewl_object_get_current_y(EWL_OBJECT(child)) +
- ewl_object_get_preferred_h(EWL_OBJECT(child)) - CURRENT_Y(o);
+ ewl_object_preferred_h_sum_get(EWL_OBJECT(child)) - CURRENT_Y(o);
if (size > PREFERRED_H(o))
ewl_object_set_preferred_h(EWL_OBJECT(o), size);
@@ -132,7 +132,7 @@
ewl_object_request_y(child, CURRENT_Y(overlay));
cs = ewl_object_get_current_x(child) +
- ewl_object_get_preferred_w(child);
+ ewl_object_preferred_w_sum_get(child);
/*
* Check the width and x position vs. overlay width.
@@ -141,7 +141,7 @@
maxw = cs;
cs = ewl_object_get_current_y(child) +
- ewl_object_get_preferred_h(child);
+ ewl_object_preferred_h_sum_get(child);
/*
* Check the height and y position vs. overlay height.
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_progressbar.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- ewl_progressbar.c 13 May 2004 06:03:00 -0000 1.10
+++ ewl_progressbar.c 11 Aug 2004 01:25:59 -0000 1.11
@@ -274,7 +274,7 @@
value = 0.01;
ewl_object_set_preferred_w (EWL_OBJECT(p),
- ewl_object_get_preferred_w (EWL_OBJECT(p->bar)) / value);
+ ewl_object_preferred_w_sum_get (EWL_OBJECT(p->bar)) / value);
ewl_container_prefer_largest (EWL_CONTAINER (c),
EWL_ORIENTATION_VERTICAL);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_row.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -3 -r1.28 -r1.29
--- ewl_row.c 2 May 2004 19:44:10 -0000 1.28
+++ ewl_row.c 11 Aug 2004 01:25:59 -0000 1.29
@@ -183,7 +183,7 @@
* Attempt to divvy up remaining space equally among
* remaining children.
*/
- portion = MAX(ewl_object_get_preferred_w(child),
+ portion = MAX(ewl_object_preferred_w_sum_get(child),
remains / nodes);
ewl_object_request_position(child, x, CURRENT_Y(w));
ewl_object_request_w(child, portion);
@@ -240,7 +240,7 @@
ewl_container_prefer_largest(c, EWL_ORIENTATION_VERTICAL);
ewl_object_set_preferred_w(EWL_OBJECT(c), PREFERRED_W(c) +
- ewl_object_get_preferred_w(EWL_OBJECT(w)));
+ ewl_object_preferred_w_sum_get(EWL_OBJECT(w)));
}
void
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_scrollpane.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -3 -r1.41 -r1.42
--- ewl_scrollpane.c 10 Jul 2004 20:00:41 -0000 1.41
+++ ewl_scrollpane.c 11 Aug 2004 01:25:59 -0000 1.42
@@ -287,8 +287,8 @@
/*
* Get the space needed by the scrolbars.
*/
- vs_width = ewl_object_get_preferred_w(EWL_OBJECT(s->vscrollbar));
- hs_height = ewl_object_get_preferred_h(EWL_OBJECT(s->hscrollbar));
+ vs_width = ewl_object_preferred_w_sum_get(EWL_OBJECT(s->vscrollbar));
+ hs_height = ewl_object_preferred_h_sum_get(EWL_OBJECT(s->hscrollbar));
/*
* Determine the space used by the contents.
@@ -314,8 +314,8 @@
* A rare case where we need to know the preferred size over the
* minimum size.
*/
- b_width = ewl_object_get_preferred_w(EWL_OBJECT(s->box));
- b_height = ewl_object_get_preferred_h(EWL_OBJECT(s->box));
+ b_width = ewl_object_preferred_w_sum_get(EWL_OBJECT(s->box));
+ b_height = ewl_object_preferred_h_sum_get(EWL_OBJECT(s->box));
/*
* Adjust the scrollbar internal stepping to match the contents.
@@ -422,10 +422,10 @@
s = EWL_SCROLLPANE(parent);
- pw = ewl_object_get_preferred_w(EWL_OBJECT(s->hscrollbar)) +
- ewl_object_get_preferred_w(EWL_OBJECT(s->box));
- ph = ewl_object_get_preferred_h(EWL_OBJECT(s->vscrollbar)) +
- ewl_object_get_preferred_h(EWL_OBJECT(s->box));
+ pw = ewl_object_preferred_w_sum_get(EWL_OBJECT(s->hscrollbar)) +
+ ewl_object_preferred_w_sum_get(EWL_OBJECT(s->box));
+ ph = ewl_object_preferred_h_sum_get(EWL_OBJECT(s->vscrollbar)) +
+ ewl_object_preferred_h_sum_get(EWL_OBJECT(s->box));
ewl_object_set_preferred_w(EWL_OBJECT(parent), pw);
ewl_object_set_preferred_h(EWL_OBJECT(parent), ph);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_seeker.c,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -3 -r1.56 -r1.57
--- ewl_seeker.c 2 Apr 2004 20:17:39 -0000 1.56
+++ ewl_seeker.c 11 Aug 2004 01:25:59 -0000 1.57
@@ -584,8 +584,8 @@
s = EWL_SEEKER(p);
- pw = ewl_object_get_preferred_w(EWL_OBJECT(w));
- ph = ewl_object_get_preferred_h(EWL_OBJECT(w));
+ pw = ewl_object_preferred_w_sum_get(EWL_OBJECT(w));
+ ph = ewl_object_preferred_h_sum_get(EWL_OBJECT(w));
if (s->orientation == EWL_ORIENTATION_HORIZONTAL)
pw *= s->range / s->step;
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_selectionbar.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- ewl_selectionbar.c 24 Mar 2004 04:11:09 -0000 1.19
+++ ewl_selectionbar.c 11 Aug 2004 01:25:59 -0000 1.20
@@ -464,9 +464,9 @@
if (CURRENT_W(EWL_OBJECT(child)) < 2 ||
CURRENT_H(EWL_OBJECT(child)) < 2) {
ewl_object_request_size(EWL_OBJECT(child),
- ewl_object_get_preferred_w
+ ewl_object_preferred_w_sum_get
(EWL_OBJECT(child)),
- ewl_object_get_preferred_h
+ ewl_object_preferred_h_sum_get
(EWL_OBJECT(child)));
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_spinner.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -3 -r1.52 -r1.53
--- ewl_spinner.c 31 May 2004 05:52:51 -0000 1.52
+++ ewl_spinner.c 11 Aug 2004 01:25:59 -0000 1.53
@@ -245,23 +245,23 @@
if (w == s->entry) {
ewl_object_set_preferred_w(EWL_OBJECT(c), PREFERRED_W(c) +
- ewl_object_get_preferred_w(EWL_OBJECT(w)));
+ ewl_object_preferred_w_sum_get(EWL_OBJECT(w)));
}
else if (s->button_increase && s->button_decrease) {
ewl_object_set_preferred_w(EWL_OBJECT(c), PREFERRED_W(c) +
- MAX(ewl_object_get_preferred_w(EWL_OBJECT(
+ MAX(ewl_object_preferred_w_sum_get(EWL_OBJECT(
s->button_increase)),
- ewl_object_get_preferred_h(EWL_OBJECT(
+ ewl_object_preferred_h_sum_get(EWL_OBJECT(
s->button_decrease))));
}
if (s->entry && s->button_increase && s->button_decrease) {
int size;
- size = ewl_object_get_preferred_w(EWL_OBJECT(s->button_increase))
- + ewl_object_get_preferred_h(EWL_OBJECT(s->button_decrease));
+ size = ewl_object_preferred_w_sum_get(EWL_OBJECT(s->button_increase))
+ +
ewl_object_preferred_h_sum_get(EWL_OBJECT(s->button_decrease));
ewl_object_set_minimum_h(EWL_OBJECT(c),
- MAX(ewl_object_get_preferred_h(EWL_OBJECT(s->entry)),
+ MAX(ewl_object_preferred_h_sum_get(EWL_OBJECT(s->entry)),
size));
}
@@ -282,19 +282,19 @@
PREFERRED_W(c) + size);
else if (s->button_increase && s->button_decrease) {
ewl_object_set_preferred_w(EWL_OBJECT(c),
- MAX(ewl_object_get_preferred_w(EWL_OBJECT(
+ MAX(ewl_object_preferred_w_sum_get(EWL_OBJECT(
s->button_increase)),
- ewl_object_get_preferred_w(EWL_OBJECT(
+ ewl_object_preferred_w_sum_get(EWL_OBJECT(
s->button_decrease))));
}
}
else if (s->entry && s->button_increase && s->button_decrease) {
- size = ewl_object_get_preferred_h(EWL_OBJECT(
+ size = ewl_object_preferred_h_sum_get(EWL_OBJECT(
s->button_increase)) +
- ewl_object_get_preferred_h(EWL_OBJECT(
+ ewl_object_preferred_h_sum_get(EWL_OBJECT(
s->button_decrease));
ewl_object_set_preferred_h(EWL_OBJECT(c),
- MAX(ewl_object_get_preferred_h(EWL_OBJECT(s->entry)),
+ MAX(ewl_object_preferred_h_sum_get(EWL_OBJECT(s->entry)),
size));
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_tree.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -3 -r1.46 -r1.47
--- ewl_tree.c 27 Jul 2004 04:37:53 -0000 1.46
+++ ewl_tree.c 11 Aug 2004 01:26:00 -0000 1.47
@@ -179,6 +179,8 @@
EWL_TREE_NODE(node)->tree = tree;
EWL_TREE_NODE(node)->row = row;
ewl_container_append_child(EWL_CONTAINER(node), row);
+ ewl_callback_append(row, EWL_CALLBACK_SELECT, ewl_tree_row_select_cb,
+ NULL);
/*
* Pretty basic here, build up the rows and add the widgets to them.
@@ -421,7 +423,7 @@
DENTER_FUNCTION(DLEVEL_STABLE);
scroll = ewl_scrollpane_get_hscrollbar_value(EWL_SCROLLPANE(tree->scrollarea));
- width = ewl_object_get_preferred_w(EWL_OBJECT(tree->header));
+ width = ewl_object_preferred_w_sum_get(EWL_OBJECT(tree->header));
x = CURRENT_X(tree);
if (scroll > 0 && width > CURRENT_W(tree))
x -= (int)((double)scroll * (double)(width - CURRENT_W(tree)));
@@ -627,7 +629,7 @@
while ((child = ecore_list_next(c->children))) {
if (VISIBLE(child) && EWL_WIDGET(child) != node->handle) {
ewl_object_request_geometry(child, x, y, CURRENT_W(w),
- ewl_object_get_preferred_h(child));
+
ewl_object_preferred_h_sum_get(child));
y += ewl_object_get_current_h(child);
}
}
@@ -682,17 +684,17 @@
if (REALIZED(node->handle) && VISIBLE(node->handle))
ewl_object_set_preferred_h(EWL_OBJECT(c),
PREFERRED_H(c) -
-
ewl_object_get_preferred_h(EWL_OBJECT(node->handle)));
+
ewl_object_preferred_h_sum_get(EWL_OBJECT(node->handle)));
}
else {
ewl_object_set_preferred_h(EWL_OBJECT(c),
-
ewl_object_get_preferred_h(EWL_OBJECT(node->row)));
+
ewl_object_preferred_h_sum_get(EWL_OBJECT(node->row)));
}
ewl_container_prefer_largest(c, EWL_ORIENTATION_HORIZONTAL);
if (REALIZED(node->handle) && VISIBLE(node->handle))
ewl_object_set_preferred_w(EWL_OBJECT(c), PREFERRED_W(c) +
- ewl_object_get_preferred_w(EWL_OBJECT(node->handle)));
+ ewl_object_preferred_w_sum_get(EWL_OBJECT(node->handle)));
if (!node->expanded)
ewl_widget_hide(node->handle);
@@ -718,9 +720,9 @@
}
ewl_object_set_preferred_h(EWL_OBJECT(c), PREFERRED_H(c) -
- ewl_object_get_preferred_h(EWL_OBJECT(w)));
+ ewl_object_preferred_h_sum_get(EWL_OBJECT(w)));
- width = ewl_object_get_preferred_w(EWL_OBJECT(w));
+ width = ewl_object_preferred_w_sum_get(EWL_OBJECT(w));
if (PREFERRED_W(c) >= width)
ewl_container_prefer_largest(c, EWL_ORIENTATION_HORIZONTAL);
-------------------------------------------------------
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
