1. default object size to 0x0
2. remove some float numbers (were cast anyway) 3. make smart object mmove/resize only called if the obj changes SVN revision: 31968
This commit is contained in:
parent
8c9fc0fc42
commit
a5d3f7ddc0
|
@ -779,10 +779,10 @@ evas_object_gradient_init(Evas_Object *obj)
|
||||||
obj->cur.color.g = 255;
|
obj->cur.color.g = 255;
|
||||||
obj->cur.color.b = 255;
|
obj->cur.color.b = 255;
|
||||||
obj->cur.color.a = 255;
|
obj->cur.color.a = 255;
|
||||||
obj->cur.geometry.x = 0.0;
|
obj->cur.geometry.x = 0;
|
||||||
obj->cur.geometry.y = 0.0;
|
obj->cur.geometry.y = 0;
|
||||||
obj->cur.geometry.w = 32.0;
|
obj->cur.geometry.w = 0;
|
||||||
obj->cur.geometry.h = 32.0;
|
obj->cur.geometry.h = 0;
|
||||||
obj->cur.layer = 0;
|
obj->cur.layer = 0;
|
||||||
obj->cur.anti_alias = 1;
|
obj->cur.anti_alias = 1;
|
||||||
obj->cur.interpolation.color_space = EVAS_COLOR_SPACE_ARGB;
|
obj->cur.interpolation.color_space = EVAS_COLOR_SPACE_ARGB;
|
||||||
|
@ -809,8 +809,8 @@ evas_object_gradient_new(void)
|
||||||
o->cur.map.direction = 1;
|
o->cur.map.direction = 1;
|
||||||
o->cur.fill.x = 0;
|
o->cur.fill.x = 0;
|
||||||
o->cur.fill.y = 0;
|
o->cur.fill.y = 0;
|
||||||
o->cur.fill.w = 32;
|
o->cur.fill.w = 1;
|
||||||
o->cur.fill.h = 32;
|
o->cur.fill.h = 1;
|
||||||
o->cur.fill.angle = 0.0;
|
o->cur.fill.angle = 0.0;
|
||||||
o->cur.fill.spread = EVAS_TEXTURE_REFLECT;
|
o->cur.fill.spread = EVAS_TEXTURE_REFLECT;
|
||||||
o->cur.type.name = strdup("linear");
|
o->cur.type.name = strdup("linear");
|
||||||
|
|
|
@ -1786,10 +1786,10 @@ evas_object_image_init(Evas_Object *obj)
|
||||||
obj->cur.color.g = 255;
|
obj->cur.color.g = 255;
|
||||||
obj->cur.color.b = 255;
|
obj->cur.color.b = 255;
|
||||||
obj->cur.color.a = 255;
|
obj->cur.color.a = 255;
|
||||||
obj->cur.geometry.x = 0.0;
|
obj->cur.geometry.x = 0;
|
||||||
obj->cur.geometry.y = 0.0;
|
obj->cur.geometry.y = 0;
|
||||||
obj->cur.geometry.w = 32.0;
|
obj->cur.geometry.w = 0;
|
||||||
obj->cur.geometry.h = 32.0;
|
obj->cur.geometry.h = 0;
|
||||||
obj->cur.layer = 0;
|
obj->cur.layer = 0;
|
||||||
obj->cur.anti_alias = 0;
|
obj->cur.anti_alias = 0;
|
||||||
obj->cur.render_op = EVAS_RENDER_BLEND;
|
obj->cur.render_op = EVAS_RENDER_BLEND;
|
||||||
|
@ -1808,8 +1808,8 @@ evas_object_image_new(void)
|
||||||
/* alloc obj private data */
|
/* alloc obj private data */
|
||||||
o = calloc(1, sizeof(Evas_Object_Image));
|
o = calloc(1, sizeof(Evas_Object_Image));
|
||||||
o->magic = MAGIC_OBJ_IMAGE;
|
o->magic = MAGIC_OBJ_IMAGE;
|
||||||
o->cur.fill.w = 32.0;
|
o->cur.fill.w = 1;
|
||||||
o->cur.fill.h = 32.0;
|
o->cur.fill.h = 1;
|
||||||
o->cur.smooth_scale = 1;
|
o->cur.smooth_scale = 1;
|
||||||
o->cur.border.fill = 1;
|
o->cur.border.fill = 1;
|
||||||
o->cur.cspace = EVAS_COLORSPACE_ARGB8888;
|
o->cur.cspace = EVAS_COLORSPACE_ARGB8888;
|
||||||
|
|
|
@ -222,10 +222,10 @@ evas_object_line_init(Evas_Object *obj)
|
||||||
obj->cur.color.g = 255;
|
obj->cur.color.g = 255;
|
||||||
obj->cur.color.b = 255;
|
obj->cur.color.b = 255;
|
||||||
obj->cur.color.a = 255;
|
obj->cur.color.a = 255;
|
||||||
obj->cur.geometry.x = 0.0;
|
obj->cur.geometry.x = 0;
|
||||||
obj->cur.geometry.y = 0.0;
|
obj->cur.geometry.y = 0;
|
||||||
obj->cur.geometry.w = 32.0;
|
obj->cur.geometry.w = 0;
|
||||||
obj->cur.geometry.h = 32.0;
|
obj->cur.geometry.h = 0;
|
||||||
obj->cur.layer = 0;
|
obj->cur.layer = 0;
|
||||||
obj->cur.anti_alias = 1;
|
obj->cur.anti_alias = 1;
|
||||||
obj->cur.render_op = EVAS_RENDER_BLEND;
|
obj->cur.render_op = EVAS_RENDER_BLEND;
|
||||||
|
|
|
@ -7,11 +7,11 @@
|
||||||
* if they are moved to the position they are already in
|
* if they are moved to the position they are already in
|
||||||
* (e.g. if they are in 0,0 and you call evas_object_move(o, 0, 0)
|
* (e.g. if they are in 0,0 and you call evas_object_move(o, 0, 0)
|
||||||
*/
|
*/
|
||||||
#define FORWARD_NOOP_MOVES_TO_SMART_OBJS
|
//#define FORWARD_NOOP_MOVES_TO_SMART_OBJS
|
||||||
|
|
||||||
/* likewise, for resizes
|
/* likewise, for resizes
|
||||||
*/
|
*/
|
||||||
#define FORWARD_NOOP_RESIZES_TO_SMART_OBJS
|
//#define FORWARD_NOOP_RESIZES_TO_SMART_OBJS
|
||||||
|
|
||||||
static Evas_Object_List *
|
static Evas_Object_List *
|
||||||
get_layer_objects_last(Evas_Layer *l)
|
get_layer_objects_last(Evas_Layer *l)
|
||||||
|
|
|
@ -90,10 +90,10 @@ evas_object_rectangle_init(Evas_Object *obj)
|
||||||
obj->cur.color.g = 255;
|
obj->cur.color.g = 255;
|
||||||
obj->cur.color.b = 255;
|
obj->cur.color.b = 255;
|
||||||
obj->cur.color.a = 255;
|
obj->cur.color.a = 255;
|
||||||
obj->cur.geometry.x = 0.0;
|
obj->cur.geometry.x = 0;
|
||||||
obj->cur.geometry.y = 0.0;
|
obj->cur.geometry.y = 0;
|
||||||
obj->cur.geometry.w = 32.0;
|
obj->cur.geometry.w = 0;
|
||||||
obj->cur.geometry.h = 32.0;
|
obj->cur.geometry.h = 0;
|
||||||
obj->cur.layer = 0;
|
obj->cur.layer = 0;
|
||||||
obj->cur.render_op = EVAS_RENDER_BLEND;
|
obj->cur.render_op = EVAS_RENDER_BLEND;
|
||||||
/* set up object-specific settings */
|
/* set up object-specific settings */
|
||||||
|
|
|
@ -491,10 +491,10 @@ evas_object_smart_init(Evas_Object *obj)
|
||||||
obj->cur.color.g = 255;
|
obj->cur.color.g = 255;
|
||||||
obj->cur.color.b = 255;
|
obj->cur.color.b = 255;
|
||||||
obj->cur.color.a = 255;
|
obj->cur.color.a = 255;
|
||||||
obj->cur.geometry.x = 0.0;
|
obj->cur.geometry.x = 0;
|
||||||
obj->cur.geometry.y = 0.0;
|
obj->cur.geometry.y = 0;
|
||||||
obj->cur.geometry.w = 32.0;
|
obj->cur.geometry.w = 0;
|
||||||
obj->cur.geometry.h = 32.0;
|
obj->cur.geometry.h = 0;
|
||||||
obj->cur.layer = 0;
|
obj->cur.layer = 0;
|
||||||
/* set up object-specific settings */
|
/* set up object-specific settings */
|
||||||
obj->prev = obj->cur;
|
obj->prev = obj->cur;
|
||||||
|
|
|
@ -285,6 +285,7 @@ eng_output_redraws_next_update_get(void *data, int *x, int *y, int *w, int *h, i
|
||||||
ux, uy, uw, uh,
|
ux, uy, uw, uh,
|
||||||
cx, cy, cw, ch);
|
cx, cy, cw, ch);
|
||||||
*x = ux; *y = uy; *w = uw; *h = uh;
|
*x = ux; *y = uy; *w = uw; *h = uh;
|
||||||
|
printf("BUF: up %i %i %ix%i\n", ux, uy, uw, uh);
|
||||||
return surface;
|
return surface;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue