Enlightenment CVS committal
Author : rbdpngn
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src
Modified Files:
Ewl.h ewl_box.c ewl_box.h ewl_container.c ewl_embed.c
ewl_grid.c ewl_misc.c ewl_notebook.c ewl_object.c ewl_object.h
ewl_seeker.c ewl_text.c ewl_textarea.c ewl_widget.c
ewl_window.c
Log Message:
Convert to use Evas_Coord, also changed native coords to int's for better X
compatibility.
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/Ewl.h,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -3 -r1.35 -r1.36
--- Ewl.h 16 Oct 2003 20:54:24 -0000 1.35
+++ Ewl.h 18 Oct 2003 17:00:35 -0000 1.36
@@ -237,6 +237,7 @@
#include <stdio.h>
#include <stdlib.h>
+#include <stdint.h>
#include <string.h>
#include <sys/types.h>
#include <sys/stat.h>
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_box.c,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -3 -r1.55 -r1.56
--- ewl_box.c 10 Oct 2003 21:42:28 -0000 1.55
+++ ewl_box.c 18 Oct 2003 17:00:35 -0000 1.56
@@ -19,12 +19,12 @@
* Function pointers for getting the dimension of the widget that we
* care about.
*/
- void (*pref_fill_set) (Ewl_Object * ob, unsigned int size);
- unsigned int (*fill_ask) (Ewl_Object * ob);
- void (*fill_set) (Ewl_Object * ob, unsigned int size);
+ void (*pref_fill_set) (Ewl_Object * ob, int size);
+ int (*fill_ask) (Ewl_Object * ob);
+ void (*fill_set) (Ewl_Object * ob, int size);
- unsigned int (*align_ask) (Ewl_Object * ob);
- void (*align_set) (Ewl_Object * ob, unsigned int size);
+ int (*align_ask) (Ewl_Object * ob);
+ void (*align_set) (Ewl_Object * ob, int size);
} Box_Orientation;
@@ -273,9 +273,9 @@
int total_fill = 0;
int x, y;
- unsigned int width, height;
+ int width, height;
int *fill, *align;
- unsigned int *fill_size, *align_size;
+ int *fill_size, *align_size;
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("w", w);
@@ -342,9 +342,9 @@
{
int i, num;
int x, y;
- unsigned int width, height;
+ int width, height;
int *fill;
- unsigned int *fill_size;
+ int *fill_size;
int remainder;
Ewl_Object *child;
Ewl_Box *b;
@@ -412,7 +412,7 @@
__ewl_box_configure_calc(Ewl_Box * b, int *fill_size, int *align_size)
{
Ewl_Object *child;
- unsigned int initial;
+ int initial;
DENTER_FUNCTION(DLEVEL_STABLE);
@@ -651,7 +651,7 @@
static void
__ewl_box_add(Ewl_Container * c, Ewl_Widget * w)
{
- unsigned int space = 0;
+ int space = 0;
DENTER_FUNCTION(DLEVEL_STABLE);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_box.h,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -3 -r1.27 -r1.28
--- ewl_box.h 16 Oct 2003 20:54:24 -0000 1.27
+++ ewl_box.h 18 Oct 2003 17:00:35 -0000 1.28
@@ -38,7 +38,7 @@
Ewl_Container container; /**< Inherit from Ewl_Container */
Ewl_Orientation orientation; /**< Indicate the orientation of layout */
- unsigned int spacing; /**< Space between each widget in the box */
+ int spacing; /**< Space between each widget in the box */
unsigned int homogeneous; /**< Flag indicating space assignemnt */
};
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_container.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -3 -r1.47 -r1.48
--- ewl_container.c 8 Oct 2003 21:42:16 -0000 1.47
+++ ewl_container.c 18 Oct 2003 17:00:36 -0000 1.48
@@ -471,8 +471,8 @@
{
Ewl_Object *child;
int curr_size, max_size = 0;
- unsigned int (*get_size)(Ewl_Object *object);
- void (*set_size)(Ewl_Object *object, unsigned int size);
+ int (*get_size)(Ewl_Object *object);
+ void (*set_size)(Ewl_Object *object, int size);
DENTER_FUNCTION(DLEVEL_STABLE);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_embed.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- ewl_embed.c 8 Oct 2003 21:42:17 -0000 1.8
+++ ewl_embed.c 18 Oct 2003 17:00:36 -0000 1.9
@@ -27,8 +27,8 @@
void __ewl_embed_smart_lower(Evas_Object *obj);
void __ewl_embed_smart_stack_above(Evas_Object *obj, Evas_Object *above);
void __ewl_embed_smart_stack_below(Evas_Object *obj, Evas_Object *below);
-void __ewl_embed_smart_move(Evas_Object *obj, double x, double y);
-void __ewl_embed_smart_resize(Evas_Object *obj, double w, double h);
+void __ewl_embed_smart_move(Evas_Object *obj, Evas_Coord x, Evas_Coord y);
+void __ewl_embed_smart_resize(Evas_Object *obj, Evas_Coord w, Evas_Coord h);
void __ewl_embed_smart_show(Evas_Object *obj);
void __ewl_embed_smart_hide(Evas_Object *obj);
void __ewl_embed_smart_color_set(Evas_Object *obj, int r, int g, int b, int a);
@@ -484,7 +484,7 @@
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
-void __ewl_embed_smart_move(Evas_Object *obj, double x, double y)
+void __ewl_embed_smart_move(Evas_Object *obj, Evas_Coord x, Evas_Coord y)
{
Ewl_Embed *emb;
@@ -496,7 +496,7 @@
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
-void __ewl_embed_smart_resize(Evas_Object *obj, double w, double h)
+void __ewl_embed_smart_resize(Evas_Object *obj, Evas_Coord w, Evas_Coord h)
{
Ewl_Embed *emb;
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_grid.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- ewl_grid.c 25 Aug 2003 19:40:42 -0000 1.10
+++ ewl_grid.c 18 Oct 2003 17:00:36 -0000 1.11
@@ -596,7 +596,7 @@
Ewl_Grid_Info *info;
int i, num_spread = 1;
Ewl_Grid_Child *cdata;
- unsigned int (*widget_size) (Ewl_Object * o);
+ int (*widget_size) (Ewl_Object * o);
DENTER_FUNCTION(DLEVEL_STABLE);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_misc.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -3 -r1.42 -r1.43
--- ewl_misc.c 8 Oct 2003 21:42:17 -0000 1.42
+++ ewl_misc.c 18 Oct 2003 17:00:36 -0000 1.43
@@ -291,7 +291,7 @@
*/
if (w->parent) {
int x, y;
- unsigned int width, height;
+ int width, height;
Ewl_Widget *p = w->parent;
ewl_object_get_current_geometry(EWL_OBJECT(w), &x, &y, &width,
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_notebook.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -3 -r1.30 -r1.31
--- ewl_notebook.c 29 Sep 2003 21:46:50 -0000 1.30
+++ ewl_notebook.c 18 Oct 2003 17:00:36 -0000 1.31
@@ -502,7 +502,7 @@
{
Ewl_Notebook *n;
int x, y;
- unsigned int width, height;
+ int width, height;
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("w", w);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_object.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -3 -r1.45 -r1.46
--- ewl_object.c 16 Oct 2003 07:05:10 -0000 1.45
+++ ewl_object.c 18 Oct 2003 17:00:36 -0000 1.46
@@ -47,8 +47,7 @@
* integers pointed to by the parameters @a x, @a y, @a w, and @a h.
*/
void
-ewl_object_get_current_geometry(Ewl_Object * o, int *x, int *y,
- unsigned int *w, unsigned int *h)
+ewl_object_get_current_geometry(Ewl_Object * o, int *x, int *y, int *w, int *h)
{
DCHECK_PARAM_PTR("o", o);
@@ -73,7 +72,7 @@
* respectively.
*/
void
-ewl_object_get_current_size(Ewl_Object * o, unsigned int *w, unsigned int *h)
+ewl_object_get_current_size(Ewl_Object * o, int *w, int *h)
{
DCHECK_PARAM_PTR("o", o);
@@ -114,7 +113,7 @@
* @return Returns the current width of the object.
* @brief Get the current width of the object
*/
-unsigned int ewl_object_get_current_w(Ewl_Object * o)
+int ewl_object_get_current_w(Ewl_Object * o)
{
int w;
@@ -141,7 +140,7 @@
* @return Returns the current height of the object.
* @brief Get the current height of the object
*/
-unsigned int ewl_object_get_current_h(Ewl_Object * o)
+int ewl_object_get_current_h(Ewl_Object * o)
{
int h;
@@ -175,8 +174,7 @@
* maximum value or smaller than the objects minimum value. If they are
* outside these bounds, the size is not altered.
*/
-void ewl_object_set_preferred_size(Ewl_Object * o, unsigned int w,
- unsigned int h)
+void ewl_object_set_preferred_size(Ewl_Object * o, int w, int h)
{
DENTER_FUNCTION(DLEVEL_STABLE);
@@ -197,7 +195,7 @@
* Sets the preferred of @a o width to @a w or as close as possible according to
* the bounds.
*/
-void ewl_object_set_preferred_w(Ewl_Object * o, unsigned int w)
+void ewl_object_set_preferred_w(Ewl_Object * o, int w)
{
int old_size, new_size, resize;
@@ -246,7 +244,7 @@
* Sets the preferred of @a o height to @a w or as close as possible according
* to the bounds.
*/
-void ewl_object_set_preferred_h(Ewl_Object * o, unsigned int h)
+void ewl_object_set_preferred_h(Ewl_Object * o, int h)
{
int old_size, new_size, resize;
@@ -296,8 +294,7 @@
* 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,
- unsigned int *w, unsigned int *h)
+void ewl_object_get_preferred_size(Ewl_Object * o, int *w, int *h)
{
DCHECK_PARAM_PTR("o", o);
@@ -312,9 +309,9 @@
* @return Returns the preferred width of the object @a o.
* @brief Get the preferred width of the object
*/
-unsigned int ewl_object_get_preferred_w(Ewl_Object * o)
+int ewl_object_get_preferred_w(Ewl_Object * o)
{
- unsigned int add, temp;
+ int add, temp;
DCHECK_PARAM_PTR_RET("o", o, 0);
@@ -337,9 +334,9 @@
* @return Returns the preferred height of the object.
* @brief Get the preferred height of the object
*/
-unsigned int ewl_object_get_preferred_h(Ewl_Object * o)
+int ewl_object_get_preferred_h(Ewl_Object * o)
{
- unsigned int add, temp;
+ int add, temp;
DCHECK_PARAM_PTR_RET("o", o, 0);
@@ -369,8 +366,7 @@
* The given geometry is requested to be applied to the object. This is the
* usual method for requesting a new geometry for an object.
*/
-void ewl_object_request_geometry(Ewl_Object * o, int x, int y,
- unsigned int w, unsigned int h)
+void ewl_object_request_geometry(Ewl_Object * o, int x, int y, int w, int h)
{
/*
* Pass the parameters on to the appropriate object request functions.
@@ -390,7 +386,7 @@
* The given size is requested to be applied to the object @a o at a later time.
* This is the usual method for requesting a new size for an object.
*/
-void ewl_object_request_size(Ewl_Object * o, unsigned int w, unsigned int h)
+void ewl_object_request_size(Ewl_Object * o, int w, int h)
{
DENTER_FUNCTION(DLEVEL_STABLE);
@@ -473,7 +469,7 @@
*
* The given width is stored to be applied to the object @a o at a later time.
*/
-void ewl_object_request_w(Ewl_Object * o, unsigned int w)
+void ewl_object_request_w(Ewl_Object * o, int w)
{
DENTER_FUNCTION(DLEVEL_STABLE);
@@ -515,7 +511,7 @@
*
* The given height is stored to be applied to the object @a o at a later time.
*/
-void ewl_object_request_h(Ewl_Object * o, unsigned int h)
+void ewl_object_request_h(Ewl_Object * o, int h)
{
DENTER_FUNCTION(DLEVEL_STABLE);
@@ -559,7 +555,7 @@
* current size or maximum size are less than the new minimum, they are set to
* the new minimum size.
*/
-void ewl_object_set_minimum_size(Ewl_Object * o, unsigned int w, unsigned int h)
+void ewl_object_set_minimum_size(Ewl_Object * o, int w, int h)
{
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("o", o);
@@ -581,9 +577,9 @@
* maximum width are less than the new minimum, they are set to the new minimum
* width.
*/
-inline void ewl_object_set_minimum_w(Ewl_Object * o, unsigned int w)
+inline void ewl_object_set_minimum_w(Ewl_Object * o, int w)
{
- unsigned int old_size, new_size;
+ int old_size, new_size;
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("o", o);
@@ -617,9 +613,9 @@
* maximum height are less than the new minimum, they are set to the new minimum
* height.
*/
-inline void ewl_object_set_minimum_h(Ewl_Object * o, unsigned int h)
+inline void ewl_object_set_minimum_h(Ewl_Object * o, int h)
{
- unsigned int old_size, new_size;
+ int old_size, new_size;
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("o", o);
@@ -647,7 +643,7 @@
* @return Returns the minimum width of the object @a o.
* @brief Get the minimum width of an object
*/
-inline unsigned int ewl_object_get_minimum_w(Ewl_Object * o)
+inline int ewl_object_get_minimum_w(Ewl_Object * o)
{
int val;
@@ -668,7 +664,7 @@
* @return Returns the minimum height of the object.
* @brief Get the minimum height of an object
*/
-inline unsigned int ewl_object_get_minimum_h(Ewl_Object * o)
+inline int ewl_object_get_minimum_h(Ewl_Object * o)
{
int val;
@@ -695,7 +691,7 @@
* to by @a w and @a h respectively.
*/
void
-ewl_object_get_minimum_size(Ewl_Object * o, unsigned int *w, unsigned int *h)
+ewl_object_get_minimum_size(Ewl_Object * o, int *w, int *h)
{
DENTER_FUNCTION(DLEVEL_STABLE);
@@ -722,7 +718,7 @@
* the new maximum size.
*/
void
-ewl_object_set_maximum_size(Ewl_Object * o, unsigned int w, unsigned int h)
+ewl_object_set_maximum_size(Ewl_Object * o, int w, int h)
{
DCHECK_PARAM_PTR("o", o);
DENTER_FUNCTION(DLEVEL_STABLE);
@@ -744,7 +740,7 @@
* minimum width are less than the new maximum, they are set to the new
* maximum width.
*/
-inline void ewl_object_set_maximum_w(Ewl_Object * o, unsigned int w)
+inline void ewl_object_set_maximum_w(Ewl_Object * o, int w)
{
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("o", o);
@@ -774,7 +770,7 @@
* current height or minimum width are less than the new maximum, they are set
* to the new maximum height.
*/
-inline void ewl_object_set_maximum_h(Ewl_Object * o, unsigned int h)
+inline void ewl_object_set_maximum_h(Ewl_Object * o, int h)
{
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("o", o);
@@ -799,7 +795,7 @@
* @return Returns the maximum width of the object.
* @brief Get the maximum width of an object
*/
-inline unsigned int ewl_object_get_maximum_w(Ewl_Object * o)
+inline int ewl_object_get_maximum_w(Ewl_Object * o)
{
int val;
@@ -811,8 +807,10 @@
else
val = PREFERRED_W(o);
- DRETURN_INT(val + PADDING_HORIZONTAL(o) + INSET_HORIZONTAL(o),
- DLEVEL_STABLE);
+ if ((val + PADDING_HORIZONTAL(o) + INSET_HORIZONTAL(o)) > val)
+ val += PADDING_HORIZONTAL(o) + INSET_HORIZONTAL(o);
+
+ DRETURN_INT(val, DLEVEL_STABLE);
}
@@ -821,7 +819,7 @@
* @return Returns the maximum height of the object.
* @brief Get the maximum height of an object
*/
-inline unsigned int ewl_object_get_maximum_h(Ewl_Object * o)
+inline int ewl_object_get_maximum_h(Ewl_Object * o)
{
int val;
@@ -833,8 +831,10 @@
else
val = PREFERRED_H(o);
- DRETURN_INT(val + PADDING_VERTICAL(o) + INSET_VERTICAL(o),
- DLEVEL_STABLE);
+ if ((val + PADDING_VERTICAL(o) + INSET_VERTICAL(o)) > val)
+ val += PADDING_VERTICAL(o) + INSET_VERTICAL(o);
+
+ DRETURN_INT(val, DLEVEL_STABLE);
}
@@ -849,7 +849,7 @@
* integers pointed to by @a w and @a h respectively.
*/
void
-ewl_object_get_maximum_size(Ewl_Object * o, unsigned int *w, unsigned int *h)
+ewl_object_get_maximum_size(Ewl_Object * o, int *w, int *h)
{
DENTER_FUNCTION(DLEVEL_STABLE);
@@ -1132,10 +1132,10 @@
* the object within that area.
*/
void
-ewl_object_place(Ewl_Object *o, int x, int y, unsigned int w, unsigned int h)
+ewl_object_place(Ewl_Object *o, int x, int y, int w, int h)
{
int x_pos, y_pos;
- unsigned int w_accept, h_accept;
+ int w_accept, h_accept;
DENTER_FUNCTION(DLEVEL_STABLE);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_object.h,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -3 -r1.35 -r1.36
--- ewl_object.h 16 Oct 2003 20:54:25 -0000 1.35
+++ ewl_object.h 18 Oct 2003 17:00:36 -0000 1.36
@@ -16,7 +16,7 @@
/**
* @def EWL_OBJECT_MIN_SIZE The maximum possible size any object can receive.
*/
-#define EWL_OBJECT_MAX_SIZE 1 << 30
+#define EWL_OBJECT_MAX_SIZE (int)((unsigned int)(1 << 30) - 1)
/**
* The base class inherited by all widgets. Provides methods for size and
@@ -66,13 +66,13 @@
{
int x, /**< Horizontal position */
y; /**< Vertical position */
- unsigned int w, /**< Width */
+ int w, /**< Width */
h; /**< Height */
} current; /**< The current size and position of an object. */
struct
{
- unsigned int w, /**< Width */
+ int w, /**< Width */
h; /**< Height */
}
preferred, /**< The optimal size of the object in ideal circumstances */
@@ -93,58 +93,48 @@
void ewl_object_init(Ewl_Object * o);
void ewl_object_get_current_geometry(Ewl_Object * o, int *x, int *y,
- unsigned int *w,
- unsigned int *h);
+ int *w, int *h);
-void ewl_object_get_current_size(Ewl_Object * o, unsigned int *w,
- unsigned int *h);
+void ewl_object_get_current_size(Ewl_Object * o, int *w, int *h);
int ewl_object_get_current_x(Ewl_Object * o);
int ewl_object_get_current_y(Ewl_Object * o);
-unsigned int ewl_object_get_current_w(Ewl_Object * o);
-unsigned int ewl_object_get_current_h(Ewl_Object * o);
+int ewl_object_get_current_w(Ewl_Object * o);
+int ewl_object_get_current_h(Ewl_Object * o);
-void ewl_object_set_preferred_size(Ewl_Object * o, unsigned int w,
- unsigned int h);
-void ewl_object_get_preferred_size(Ewl_Object * o, unsigned int *w,
- unsigned int *h);
-void ewl_object_set_preferred_w(Ewl_Object * o, unsigned int w);
-unsigned int ewl_object_get_preferred_w(Ewl_Object * o);
-void ewl_object_set_preferred_h(Ewl_Object * o, unsigned int h);
-unsigned int ewl_object_get_preferred_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_set_preferred_w(Ewl_Object * o, int w);
+int ewl_object_get_preferred_w(Ewl_Object * o);
+void ewl_object_set_preferred_h(Ewl_Object * o, int h);
+int ewl_object_get_preferred_h(Ewl_Object * o);
void ewl_object_request_geometry(Ewl_Object * o, int x, int y,
- unsigned int w, unsigned int h);
-void ewl_object_request_size(Ewl_Object * o, unsigned int w,
- unsigned int h);
+ int w, int h);
+void ewl_object_request_size(Ewl_Object * o, int w, int h);
void ewl_object_request_position(Ewl_Object * o, int x, int y);
inline void ewl_object_request_x(Ewl_Object * o, int x);
inline void ewl_object_request_y(Ewl_Object * o, int y);
-void ewl_object_request_w(Ewl_Object * o, unsigned int w);
-void ewl_object_request_h(Ewl_Object * o, unsigned int h);
+void ewl_object_request_w(Ewl_Object * o, int w);
+void ewl_object_request_h(Ewl_Object * o, int h);
-void ewl_object_set_minimum_size(Ewl_Object * o, unsigned int w,
- unsigned int h);
-inline void ewl_object_set_minimum_w(Ewl_Object * o, unsigned int w);
-inline void ewl_object_set_minimum_h(Ewl_Object * o, unsigned int h);
-
-void ewl_object_get_minimum_size(Ewl_Object * o, unsigned int *w,
- unsigned int *h);
-inline unsigned int ewl_object_get_minimum_w(Ewl_Object * o);
-inline unsigned int ewl_object_get_minimum_h(Ewl_Object * o);
-
-void ewl_object_set_maximum_size(Ewl_Object * o, unsigned int w,
- unsigned int h);
-inline void ewl_object_set_maximum_w(Ewl_Object * o, unsigned int w);
-inline void ewl_object_set_maximum_h(Ewl_Object * o, unsigned int h);
-
-void ewl_object_get_maximum_size(Ewl_Object * o, unsigned int *w,
- unsigned int *h);
-inline unsigned int ewl_object_get_maximum_w(Ewl_Object * o);
-inline unsigned int ewl_object_get_maximum_h(Ewl_Object * o);
+void ewl_object_set_minimum_size(Ewl_Object * o, int w, int h);
+inline void ewl_object_set_minimum_w(Ewl_Object * o, int w);
+inline void ewl_object_set_minimum_h(Ewl_Object * o, int h);
+
+void ewl_object_get_minimum_size(Ewl_Object * o, int *w, int *h);
+inline int ewl_object_get_minimum_w(Ewl_Object * o);
+inline int ewl_object_get_minimum_h(Ewl_Object * o);
+
+void ewl_object_set_maximum_size(Ewl_Object * o, int w, int h);
+inline void ewl_object_set_maximum_w(Ewl_Object * o, int w);
+inline void ewl_object_set_maximum_h(Ewl_Object * o, int h);
+
+void ewl_object_get_maximum_size(Ewl_Object * o, int *w, int *h);
+inline int ewl_object_get_maximum_w(Ewl_Object * o);
+inline int ewl_object_get_maximum_h(Ewl_Object * o);
inline void ewl_object_set_alignment(Ewl_Object * o, unsigned int align);
-void ewl_object_place(Ewl_Object *o, int x, int y, unsigned
- int w, unsigned int h);
+void ewl_object_place(Ewl_Object *o, int x, int y, int w, int h);
/**
* @def ewl_object_get_alignment(o)
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_seeker.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -3 -r1.44 -r1.45
--- ewl_seeker.c 29 Sep 2003 21:46:51 -0000 1.44
+++ ewl_seeker.c 18 Oct 2003 17:00:36 -0000 1.45
@@ -351,7 +351,7 @@
Ewl_Seeker *s;
double s1, s2;
int dx, dy;
- unsigned int dw, dh;
+ int dw, dh;
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("w", w);
@@ -440,7 +440,7 @@
Ewl_Seeker *s;
int mx, my;
int dx, dy;
- unsigned int dw, dh;
+ int dw, dh;
double scale;
DENTER_FUNCTION(DLEVEL_STABLE);
@@ -471,7 +471,7 @@
dh = CURRENT_H(s);
if (s->orientation == EWL_ORIENTATION_HORIZONTAL) {
- unsigned int adjust;
+ int adjust;
adjust = ewl_object_get_current_w(EWL_OBJECT(s->button));
dw -= adjust;
@@ -490,7 +490,7 @@
scale = (double)(mx - dx) / (double)dw;
}
else {
- unsigned int adjust;
+ int adjust;
adjust = ewl_object_get_current_h(EWL_OBJECT(s->button));
dh -= adjust;
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_text.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -3 -r1.53 -r1.54
--- ewl_text.c 7 Oct 2003 21:26:23 -0000 1.53
+++ ewl_text.c 18 Oct 2003 17:00:37 -0000 1.54
@@ -115,7 +115,7 @@
t->length = estyle_length(t->estyle);
evas_object_geometry_get(t->estyle, &x, &y, &width, &height);
ewl_object_set_preferred_size(EWL_OBJECT(t),
- (unsigned int)(width), (unsigned int)(height));
+ (int)(width), (int)(height));
}
else
t->length = strlen(t->text);
@@ -170,7 +170,7 @@
* Change the font for the estyle.
*/
if (t->estyle) {
- double x, y, width, height;
+ Evas_Coord x, y, width, height;
/*
* Change the font and then update the size of the widget
@@ -178,7 +178,7 @@
estyle_set_font(t->estyle, t->font, t->font_size);
evas_object_geometry_get(t->estyle, &x, &y, &width, &height);
ewl_object_set_preferred_size(EWL_OBJECT(t),
- (unsigned int)(width), (unsigned int)(height));
+ (int)(width), (int)(height));
}
ewl_widget_configure(w);
@@ -229,7 +229,7 @@
* Change the font for the estyle.
*/
if (t->estyle) {
- double x, y, width, height;
+ Evas_Coord x, y, width, height;
/*
* Change the font and then update the size of the widget
@@ -237,7 +237,7 @@
estyle_set_font(t->estyle, t->font, t->font_size);
evas_object_geometry_get(t->estyle, &x, &y, &width, &height);
ewl_object_set_preferred_size(EWL_OBJECT(t),
- (unsigned int)(width), (unsigned int)(height));
+ (int)(width), (int)(height));
}
ewl_widget_configure(w);
@@ -359,7 +359,7 @@
* Change the font for the estyle.
*/
if (t->estyle) {
- double x, y, width, height;
+ Evas_Coord x, y, width, height;
/*
* Change the font and then update the size of the widget
@@ -367,7 +367,7 @@
estyle_set_style(t->estyle, t->style);
evas_object_geometry_get(t->estyle, &x, &y, &width, &height);
ewl_object_set_preferred_size(EWL_OBJECT(t),
- (unsigned int)(width), (unsigned int)(height));
+ (int)(width), (int)(height));
}
t->overrides |= EWL_TEXT_OVERRIDE_STYLE;
@@ -392,7 +392,7 @@
void
ewl_text_get_text_geometry(Ewl_Text * t, int *xx, int *yy, int *ww, int *hh)
{
- double ex, ey, ew, eh;
+ Evas_Coord ex, ey, ew, eh;
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("t", t);
@@ -448,7 +448,7 @@
ewl_text_get_letter_geometry(Ewl_Text * t, int i, int *xx, int *yy,
int *ww, int *hh)
{
- double ex = 0, ey = 0, ew = 0, eh = 0;
+ Evas_Coord ex = 0, ey = 0, ew = 0, eh = 0;
Ewl_Widget *w;
DENTER_FUNCTION(DLEVEL_STABLE);
@@ -490,7 +490,7 @@
ewl_text_get_letter_geometry_at(Ewl_Text * t, int x, int y,
int *tx, int *ty, int *tw, int *th)
{
- double ex = 0, ey = 0, ew = 0, eh = 0;
+ Evas_Coord ex = 0, ey = 0, ew = 0, eh = 0;
int i = 0;
Ewl_Widget *w;
@@ -501,8 +501,8 @@
if (t->estyle) {
- i = estyle_text_at_position(t->estyle, (double)x, (double)y,
- &ex, &ey, &ew, &eh);
+ i = estyle_text_at_position(t->estyle, (Evas_Coord)(x),
+ (Evas_Coord)(y), &ex, &ey, &ew, &eh);
}
if (tx)
@@ -556,10 +556,11 @@
w = EWL_WIDGET(t);
DRETURN_INT(t->
- estyle ? estyle_text_at_position(t->estyle, (double) x,
- (double) y, NULL,
- NULL, NULL, NULL) : 0,
- DLEVEL_STABLE);
+ estyle ? estyle_text_at_position(t->estyle,
+ (Evas_Coord)(x),
+ (Evas_Coord)(y),
+ NULL, NULL, NULL, NULL) :
+ 0, DLEVEL_STABLE);
}
void
@@ -568,7 +569,7 @@
Ewl_Text *t;
Ewl_Embed *emb;
char key[PATH_MAX];
- double x, y, width, height;
+ Evas_Coord x, y, width, height;
DENTER_FUNCTION(DLEVEL_STABLE);
@@ -628,8 +629,8 @@
evas_object_show(t->estyle);
evas_object_geometry_get(t->estyle, &x, &y, &width, &height);
- ewl_object_set_preferred_size(EWL_OBJECT(t),
- (unsigned int)(width), (unsigned int)(height));
+ ewl_object_set_preferred_size(EWL_OBJECT(t), (int)(width),
+ (int)(height));
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_textarea.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- ewl_textarea.c 22 Sep 2003 06:09:24 -0000 1.16
+++ ewl_textarea.c 18 Oct 2003 17:00:37 -0000 1.17
@@ -273,7 +273,7 @@
*/
void __ewl_textarea_update_size(Ewl_TextArea * ta)
{
- double x, y, width, height;
+ Evas_Coord x, y, width, height;
/*
* Adjust the properties of the widget to indicate the size of the text.
@@ -287,13 +287,13 @@
* Set the preferred size to the size of the etox and request that
* size for the widget.
*/
- ewl_object_set_preferred_size(EWL_OBJECT(ta), (unsigned int)(width),
- (unsigned int)(height));
+ ewl_object_set_preferred_size(EWL_OBJECT(ta), (int)(width),
+ (int)(height));
/*
* FIXME: Should we really be doing this? Probably not, test it out
* more thoroughly.
*/
- ewl_object_set_custom_size(EWL_OBJECT(ta), (unsigned int)(width),
- (unsigned int)(height));
+ ewl_object_set_custom_size(EWL_OBJECT(ta), (int)(width),
+ (int)(height));
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_widget.c,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -3 -r1.76 -r1.77
--- ewl_widget.c 8 Oct 2003 21:42:18 -0000 1.76
+++ ewl_widget.c 18 Oct 2003 17:00:37 -0000 1.77
@@ -749,7 +749,7 @@
char *i = NULL;
char *key = NULL;
char *group = NULL;
- double width, height;
+ Evas_Coord width, height;
Ewl_Embed *emb = NULL;
Ewl_Container *pc = NULL;
@@ -862,8 +862,8 @@
* Propagate minimum sizes from the bit theme to the widget.
*/
edje_object_size_min_get(w->theme_object, &width, &height);
- i_l = (unsigned int)(width);
- i_t = (unsigned int)(height);
+ i_l = (int)(width);
+ i_t = (int)(height);
if (i_l && MINIMUM_W(w) == EWL_OBJECT_MIN_SIZE)
ewl_object_set_minimum_w(EWL_OBJECT(w), i_l);
@@ -875,8 +875,8 @@
* Propagate maximum sizes from the bit theme to the widget.
*/
edje_object_size_max_get(w->theme_object, &width, &height);
- i_l = (unsigned int)(width);
- i_t = (unsigned int)(height);
+ i_l = (int)(width);
+ i_t = (int)(height);
if (i_l && MAXIMUM_W(w) == EWL_OBJECT_MAX_SIZE)
ewl_object_set_maximum_w(EWL_OBJECT(w), i_l);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_window.c,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -3 -r1.56 -r1.57
--- ewl_window.c 7 Oct 2003 21:26:23 -0000 1.56
+++ ewl_window.c 18 Oct 2003 17:00:37 -0000 1.57
@@ -354,7 +354,7 @@
void __ewl_window_configure(Ewl_Widget * w, void *ev_data, void *user_data)
{
Ewl_Window *win;
- unsigned int width, height;
+ int width, height;
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("w", w);
-------------------------------------------------------
This SF.net email sponsored by: Enterprise Linux Forum Conference & Expo
The Event For Linux Datacenter Solutions & Strategies in The Enterprise
Linux in the Boardroom; in the Front Office; & in the Server Room
http://www.enterpriselinuxforum.com
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
