From 810cf112413ba23ab0e9ee10c1fb54dfd2eb221f Mon Sep 17 00:00:00 2001 From: Christopher Michael Date: Mon, 26 Dec 2011 23:11:07 +0000 Subject: [PATCH] Evas: Default framespace to zero on new canvas creation. Some cleanup of commented out code. Fix some formatting. SVN revision: 66538 --- legacy/evas/src/lib/canvas/evas_main.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/legacy/evas/src/lib/canvas/evas_main.c b/legacy/evas/src/lib/canvas/evas_main.c index 2466a37b8d..7b305a809a 100644 --- a/legacy/evas/src/lib/canvas/evas_main.c +++ b/legacy/evas/src/lib/canvas/evas_main.c @@ -118,12 +118,16 @@ evas_new(void) e->output.render_method = RENDER_METHOD_INVALID; e->viewport.w = 1; e->viewport.h = 1; + e->framespace.x = 0; + e->framespace.y = 0; + e->framespace.w = 0; + e->framespace.h = 0; e->hinting = EVAS_FONT_HINTING_BYTECODE; e->name_hash = eina_hash_string_superfast_new(NULL); eina_clist_init(&e->calc_list); eina_clist_init(&e->calc_done); -#define EVAS_ARRAY_SET(E, Array) \ +#define EVAS_ARRAY_SET(E, Array) \ eina_array_step_set(&E->Array, sizeof (E->Array), 4096); EVAS_ARRAY_SET(e, delete_objects); @@ -419,18 +423,12 @@ evas_output_framespace_set(Evas *e, Evas_Coord x, Evas_Coord y, Evas_Coord w, Ev (w == e->framespace.w) && (h == e->framespace.h)) return; if (w <= 0) return; if (h <= 0) return; - /* if ((x != 0) || (y != 0)) */ - /* { */ - /* ERR("Compat error. viewport x,y != 0,0 not supported"); */ - /* x = 0; */ - /* y = 0; */ - /* } */ e->framespace.x = x; e->framespace.y = y; e->framespace.w = w; e->framespace.h = h; e->framespace.changed = 1; - /* e->output_validity++; */ + e->output_validity++; e->changed = 1; }