Enlightenment CVS committal
Author : rbdpngn
Project : e17
Module : libs/estyle
Dir : e17/libs/estyle/src
Modified Files:
Estyle.h Estyle_private.h estyle.c estyle_style.c
estyle_style.h
Log Message:
Update estyle to use the new Evas_Coord type.
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/src/Estyle.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- Estyle.h 8 Sep 2003 02:20:35 -0000 1.16
+++ Estyle.h 18 Oct 2003 16:22:46 -0000 1.17
@@ -39,17 +39,18 @@
* Geometry querying
*/
inline int estyle_length(Evas_Object *obj);
-void estyle_text_at(Evas_Object *obj, int index, double *char_x,
- double *char_y, double *char_w, double *char_h);
-int estyle_text_at_position(Evas_Object *obj, double x, double y,
- double *char_x, double *char_y, double *char_w, double *char_h);
+void estyle_text_at(Evas_Object *obj, int index, Evas_Coord *char_x,
+ Evas_Coord *char_y, Evas_Coord *char_w, Evas_Coord *char_h);
+int estyle_text_at_position(Evas_Object *obj, Evas_Coord x, Evas_Coord y,
+ Evas_Coord *char_x, Evas_Coord *char_y,
+ Evas_Coord *char_w, Evas_Coord *char_h);
/*
* Fixing the reported geometry to set values.
*/
inline int estyle_fixed(Evas_Object *obj);
-void estyle_fix_geometry(Evas_Object *obj, double x, double y, double w,
- double h);
+void estyle_fix_geometry(Evas_Object *obj, Evas_Coord x, Evas_Coord y,
+ Evas_Coord w, Evas_Coord h);
void estyle_unfix_geometry(Evas_Object *obj);
/*
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/src/Estyle_private.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- Estyle_private.h 8 Sep 2003 02:20:35 -0000 1.14
+++ Estyle_private.h 18 Oct 2003 16:22:46 -0000 1.15
@@ -48,7 +48,7 @@
* case of a tab character, the width of the bit does not match the
* width of the actual character printed.
*/
- double x, y, w, h;
+ Evas_Coord x, y, w, h;
/*
* The flags field is used to indicate that the bit is not to be moved
@@ -106,8 +106,8 @@
void estyle_free(Evas_Object *obj);
void estyle_show(Evas_Object *obj);
void estyle_hide(Evas_Object *obj);
-void estyle_move(Evas_Object *obj, double x, double y);
-void estyle_resize(Evas_Object *obj, double w, double h);
+void estyle_move(Evas_Object *obj, Evas_Coord x, Evas_Coord y);
+void estyle_resize(Evas_Object *obj, Evas_Coord w, Evas_Coord h);
void estyle_set_layer(Evas_Object *obj, int layer);
void estyle_set_color(Evas_Object *obj, int r, int g, int b, int a);
void estyle_set_clip(Evas_Object *obj, Evas_Object *clip);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/src/estyle.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -3 -r1.29 -r1.30
--- estyle.c 8 Sep 2003 02:20:35 -0000 1.29
+++ estyle.c 18 Oct 2003 16:22:46 -0000 1.30
@@ -159,7 +159,7 @@
*
* Returns no value. Moves the requested estyle into the requested position.
*/
-void estyle_move(Evas_Object *obj, double x, double y)
+void estyle_move(Evas_Object *obj, Evas_Coord x, Evas_Coord y)
{
Estyle *es;
@@ -186,7 +186,7 @@
*
* Returns no value. Moves the requested estyle into the requested position.
*/
-void estyle_resize(Evas_Object *obj, double w, double h)
+void estyle_resize(Evas_Object *obj, Evas_Coord w, Evas_Coord h)
{
Estyle *es;
@@ -523,7 +523,7 @@
char *estyle_get_font(Evas_Object *obj)
{
char *font;
- double size;
+ Evas_Font_Size size;
Estyle * es;
CHECK_PARAM_POINTER_RETURN("obj", obj, NULL);
@@ -541,7 +541,7 @@
int estyle_get_font_size(Evas_Object *obj)
{
char *font;
- double size;
+ Evas_Font_Size size;
Estyle *es;
CHECK_PARAM_POINTER_RETURN("obj", obj, 0);
@@ -811,8 +811,8 @@
* Returns no value. The dimensions of the found character are stored in
* @char_x, @char_y, @char_w, and @char_h.
*/
-void estyle_text_at(Evas_Object *obj, int index, double *x, double *y,
- double *w, double *h)
+void estyle_text_at(Evas_Object *obj, int index, Evas_Coord *x, Evas_Coord *y,
+ Evas_Coord *w, Evas_Coord *h)
{
Estyle * es;
@@ -848,8 +848,9 @@
* dimensions of the found character are stored in @char_x, @char_y, @char_w,
* and @char_h.
*/
-int estyle_text_at_position(Evas_Object *obj, double x, double y, double *xx,
- double *yy, double *ww, double *hh)
+int estyle_text_at_position(Evas_Object *obj, Evas_Coord x, Evas_Coord y,
+ Evas_Coord *xx, Evas_Coord *yy,
+ Evas_Coord *ww, Evas_Coord *hh)
{
int ret;
Estyle * es;
@@ -903,8 +904,8 @@
* Returns no value. Fixes the reported geometry of @es to @x, @y, @w, and @h
* respectively.
*/
-void estyle_fix_geometry(Evas_Object *obj, double x, double y,
- double w, double h)
+void estyle_fix_geometry(Evas_Object *obj, Evas_Coord x, Evas_Coord y,
+ Evas_Coord w, Evas_Coord h)
{
Estyle * es;
@@ -942,9 +943,9 @@
{
if (es->style)
evas_object_move(es->bit,
- (double)(es->x + (es->style ?
+ (Evas_Coord)(es->x + (es->style ?
es->style->info->left_push : 0)),
- (double)(es->y + (es->style ?
+ (Evas_Coord)(es->y + (es->style ?
es->style->info->top_push : 0)));
}
@@ -953,7 +954,7 @@
*/
void __estyle_update_dimensions(Estyle *es)
{
- double x, y, w, h;
+ Evas_Coord x, y, w, h;
/*
* If the estyle doesn't have fixed dimensions then set it to the
@@ -1084,7 +1085,7 @@
{
Estyle * es;
- CHECK_PARAM_POINTER("obj", obj);
+ CHECK_PARAM_POINTER_RETURN("obj", obj, 0);
es = evas_object_smart_data_get(obj);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/src/estyle_style.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- estyle_style.c 5 Aug 2003 16:42:44 -0000 1.12
+++ estyle_style.c 18 Oct 2003 16:22:46 -0000 1.13
@@ -330,9 +330,9 @@
(layer = _estyle_heap_item(info->layers, i++)) != NULL &&
(ob = ptr_list->data) != NULL) {
- evas_object_move(ob, (double)(es->x + layer->x_offset +
+ evas_object_move(ob, (Evas_Coord)(es->x + layer->x_offset +
info->left_push),
- (double)(es->y + layer->y_offset +
+ (Evas_Coord)(es->y + layer->y_offset +
info->right_push));
ptr_list = ptr_list->next;
@@ -607,7 +607,7 @@
{
int r, g, b, a;
char *font;
- double size;
+ Evas_Font_Size size;
Evas_Object *ret;
/*
@@ -618,9 +618,9 @@
evas_object_text_font_set(ret, font, size + layer->size_change);
evas_object_text_text_set(ret, text);
- evas_object_move(ret, (double)(es->x + layer->x_offset +
+ evas_object_move(ret, (Evas_Coord)(es->x + layer->x_offset +
es->style->info->left_push),
- (double)(es->y + layer->y_offset +
+ (Evas_Coord)(es->y + layer->y_offset +
es->style->info->top_push));
/*
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/src/estyle_style.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- estyle_style.h 5 Aug 2003 16:42:44 -0000 1.8
+++ estyle_style.h 18 Oct 2003 16:22:46 -0000 1.9
@@ -9,7 +9,7 @@
typedef struct _estyle_style_layer Estyle_Style_Layer;
struct _estyle_style_layer {
int stack;
- double x_offset, y_offset;
+ Evas_Coord x_offset, y_offset;
int size_change;
int a, r, g, b;
@@ -25,7 +25,7 @@
char *name;
E_DB_File *style_db;
Estyle_Heap *layers;
- double left_push, right_push, top_push, bottom_push;
+ Evas_Coord left_push, right_push, top_push, bottom_push;
int references;
};
-------------------------------------------------------
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
