summaryrefslogtreecommitdiff
path: root/src/lib/edje
diff options
context:
space:
mode:
authorCedric BAIL <cedric@osg.samsung.com>2016-12-20 16:00:26 -0800
committerCedric BAIL <cedric@osg.samsung.com>2016-12-20 16:39:30 -0800
commit14d7ec478cf5b7fbb61346a7da15faf90910b59d (patch)
tree78fc9992822a09f34f9d29efa1808ce65d0b0c59 /src/lib/edje
parent7abe432992fd974c7440097f97a607fea845172d (diff)
edje: fix float comparison warning in edje edit logic.
Diffstat (limited to 'src/lib/edje')
-rw-r--r--src/lib/edje/edje_edit.c140
1 files changed, 70 insertions, 70 deletions
diff --git a/src/lib/edje/edje_edit.c b/src/lib/edje/edje_edit.c
index 6c57a7569b..de88db33e4 100644
--- a/src/lib/edje/edje_edit.c
+++ b/src/lib/edje/edje_edit.c
@@ -6192,7 +6192,7 @@ edje_edit_state_name_set(Evas_Object *obj, const char *part, const char *state,
6192 6192
6193 if (t->id == part_id && 6193 if (t->id == part_id &&
6194 !strcmp(epr->state, pd->state.name) && 6194 !strcmp(epr->state, pd->state.name) &&
6195 pd->state.value == epr->value) 6195 EQ(pd->state.value, epr->value))
6196 { 6196 {
6197 _edje_if_string_replace(ed, &epr->state, new_name); 6197 _edje_if_string_replace(ed, &epr->state, new_name);
6198 epr->value = value; 6198 epr->value = value;
@@ -6480,7 +6480,7 @@ edje_edit_state_add(Evas_Object *obj, const char *part, const char *name, double
6480 break; 6480 break;
6481 6481
6482 case EDJE_EXTERNAL_PARAM_TYPE_DOUBLE: 6482 case EDJE_EXTERNAL_PARAM_TYPE_DOUBLE:
6483 if (pi->info.d.def != EDJE_EXTERNAL_DOUBLE_UNSET) 6483 if (NEQ(pi->info.d.def, EDJE_EXTERNAL_DOUBLE_UNSET))
6484 p->d = pi->info.d.def; 6484 p->d = pi->info.d.def;
6485 break; 6485 break;
6486 6486
@@ -7577,7 +7577,7 @@ edje_edit_state_external_param_set(Evas_Object *obj, const char *part, const cha
7577 const char *sname; 7577 const char *sname;
7578 double svalue; 7578 double svalue;
7579 sname = edje_edit_part_selected_state_get(obj, part, &svalue); 7579 sname = edje_edit_part_selected_state_get(obj, part, &svalue);
7580 if (!strcmp(state, sname) && svalue == value) 7580 if (!strcmp(state, sname) && EQ(svalue, value))
7581 if (!edje_object_part_external_param_set(obj, part, p)) 7581 if (!edje_object_part_external_param_set(obj, part, p))
7582 if ((type == EDJE_EXTERNAL_PARAM_TYPE_CHOICE) || 7582 if ((type == EDJE_EXTERNAL_PARAM_TYPE_CHOICE) ||
7583 (type == EDJE_EXTERNAL_PARAM_TYPE_STRING)) 7583 (type == EDJE_EXTERNAL_PARAM_TYPE_STRING))
@@ -12412,7 +12412,7 @@ _edje_generate_image_set_source(Evas_Object *obj, const char *entry)
12412 12412
12413 double scale_by = 0; 12413 double scale_by = 0;
12414 scale_by = edje_edit_image_set_image_border_scale_get(obj, entry, place); 12414 scale_by = edje_edit_image_set_image_border_scale_get(obj, entry, place);
12415 if (scale_by != 0) 12415 if (NEQ(scale_by, 0))
12416 BUF_APPENDF(I3 "border_scale_by: %.3f;\n", scale_by); 12416 BUF_APPENDF(I3 "border_scale_by: %.3f;\n", scale_by);
12417 12417
12418 BUF_APPEND(I2 "}\n"); 12418 BUF_APPEND(I2 "}\n");
@@ -13249,7 +13249,7 @@ _edje_generate_source_of_program(Evas_Object *obj, const char *program, Eina_Str
13249 switch (tweenmode) 13249 switch (tweenmode)
13250 { 13250 {
13251 case EDJE_TWEEN_MODE_LINEAR: 13251 case EDJE_TWEEN_MODE_LINEAR:
13252 if (db) 13252 if (NEQ(db, ZERO))
13253 BUF_APPENDF(I4 "transition: LINEAR %.5f", db); 13253 BUF_APPENDF(I4 "transition: LINEAR %.5f", db);
13254 else 13254 else
13255 no_transition = EINA_TRUE; 13255 no_transition = EINA_TRUE;
@@ -13323,7 +13323,7 @@ _edje_generate_source_of_program(Evas_Object *obj, const char *program, Eina_Str
13323 /* In */ 13323 /* In */
13324 db = epr->in.from; 13324 db = epr->in.from;
13325 db2 = epr->in.range; 13325 db2 = epr->in.range;
13326 if (db || db2) 13326 if (NEQ(db, ZERO) || NEQ(db2, ZERO))
13327 BUF_APPENDF(I4 "in: %.5f %.5f;\n", db, db2); 13327 BUF_APPENDF(I4 "in: %.5f %.5f;\n", db, db2);
13328 13328
13329 /* Targets */ 13329 /* Targets */
@@ -13399,7 +13399,7 @@ _edje_source_with_double_values_append(const char *param_name, char val_num, dou
13399 13399
13400#define INHERIT_CHECK(ATTRIBUTE) (pd->ATTRIBUTE != inherit_pd->ATTRIBUTE) 13400#define INHERIT_CHECK(ATTRIBUTE) (pd->ATTRIBUTE != inherit_pd->ATTRIBUTE)
13401 13401
13402#define INHERIT_CHECK_DOUBLE(ATTRIBUTE_1, ATTRIBUTE_2) ((pd->ATTRIBUTE_1 != inherit_pd->ATTRIBUTE_1) || (pd->ATTRIBUTE_2 != inherit_pd->ATTRIBUTE_2)) 13402#define INHERIT_CHECK_DOUBLE(ATTRIBUTE_1, ATTRIBUTE_2) ((NEQ(pd->ATTRIBUTE_1, inherit_pd->ATTRIBUTE_1)) || (NEQ(pd->ATTRIBUTE_2, inherit_pd->ATTRIBUTE_2)))
13403 13403
13404#define INHERIT_CHECK_STRING(ATTRIBUTE_STR) (strcmp(inherit_pd->ATTRIBUTE_STR, pd->ATTRIBUTE_STR)) 13404#define INHERIT_CHECK_STRING(ATTRIBUTE_STR) (strcmp(inherit_pd->ATTRIBUTE_STR, pd->ATTRIBUTE_STR))
13405 13405
@@ -13453,7 +13453,7 @@ _edje_generate_source_state_relative(Edje *ed,
13453 } 13453 }
13454 else 13454 else
13455 { 13455 {
13456 relative = ((pd->rel1.relative_x == 0) && (pd->rel1.relative_y == 0)) ? EINA_FALSE : EINA_TRUE; 13456 relative = (EQ(pd->rel1.relative_x, ZERO) && EQ(pd->rel1.relative_y, ZERO)) ? EINA_FALSE : EINA_TRUE;
13457 offset = ((pd->rel1.offset_x == 0) && (pd->rel1.offset_y == 0)) ? EINA_FALSE : EINA_TRUE; 13457 offset = ((pd->rel1.offset_x == 0) && (pd->rel1.offset_y == 0)) ? EINA_FALSE : EINA_TRUE;
13458 if ((pd->rel1.id_x != -1) || (pd->rel1.id_y != -1)) 13458 if ((pd->rel1.id_x != -1) || (pd->rel1.id_y != -1))
13459 { 13459 {
@@ -13574,7 +13574,7 @@ _edje_generate_source_state_relative(Edje *ed,
13574 } 13574 }
13575 else 13575 else
13576 { 13576 {
13577 relative = ((pd->rel2.relative_x == 1) && (pd->rel2.relative_y == 1)) ? EINA_FALSE : EINA_TRUE; 13577 relative = (EQ(pd->rel2.relative_x, FROM_INT(1)) && EQ(pd->rel2.relative_y, FROM_INT(1))) ? EINA_FALSE : EINA_TRUE;
13578 offset = ((pd->rel2.offset_x == -1) && (pd->rel2.offset_y == -1)) ? EINA_FALSE : EINA_TRUE; 13578 offset = ((pd->rel2.offset_x == -1) && (pd->rel2.offset_y == -1)) ? EINA_FALSE : EINA_TRUE;
13579 if ((pd->rel2.id_x != -1) || (pd->rel2.id_y != -1)) 13579 if ((pd->rel2.id_x != -1) || (pd->rel2.id_y != -1))
13580 { 13580 {
@@ -13692,9 +13692,9 @@ _edje_generate_source_state_image(Edje_Edit *eed, Evas_Object *obj,
13692 (img->image.border.t == inherit_pd_img->image.border.t) && 13692 (img->image.border.t == inherit_pd_img->image.border.t) &&
13693 (img->image.border.b == inherit_pd_img->image.border.b)) ? EINA_FALSE : EINA_TRUE; 13693 (img->image.border.b == inherit_pd_img->image.border.b)) ? EINA_FALSE : EINA_TRUE;
13694 13694
13695 border_scale_by = (img->image.border.scale_by == inherit_pd_img->image.border.scale_by) ? EINA_FALSE : EINA_TRUE; 13695 border_scale_by = EQ(img->image.border.scale_by, inherit_pd_img->image.border.scale_by) ? EINA_FALSE : EINA_TRUE;
13696 13696
13697 scale_hint = (img->image.scale_hint == inherit_pd_img->image.scale_hint) ? EINA_FALSE : EINA_TRUE; 13697 scale_hint = EQ(img->image.scale_hint, inherit_pd_img->image.scale_hint) ? EINA_FALSE : EINA_TRUE;
13698 13698
13699 border_no_fill = (img->image.border.no_fill == inherit_pd_img->image.border.no_fill) ? EINA_FALSE : EINA_TRUE; 13699 border_no_fill = (img->image.border.no_fill == inherit_pd_img->image.border.no_fill) ? EINA_FALSE : EINA_TRUE;
13700 13700
@@ -13719,7 +13719,7 @@ _edje_generate_source_state_image(Edje_Edit *eed, Evas_Object *obj,
13719 name = (img->image.id == -1) ? EINA_FALSE : EINA_TRUE; 13719 name = (img->image.id == -1) ? EINA_FALSE : EINA_TRUE;
13720 border = (img->image.border.l == 0 && img->image.border.r == 0 && 13720 border = (img->image.border.l == 0 && img->image.border.r == 0 &&
13721 img->image.border.t == 0 && img->image.border.b == 0) ? EINA_FALSE : EINA_TRUE; 13721 img->image.border.t == 0 && img->image.border.b == 0) ? EINA_FALSE : EINA_TRUE;
13722 border_scale_by = (img->image.border.scale_by == 0) ? EINA_FALSE : EINA_TRUE; 13722 border_scale_by = EQ(img->image.border.scale_by, ZERO) ? EINA_FALSE : EINA_TRUE;
13723 scale_hint = (img->image.scale_hint == EVAS_IMAGE_SCALE_HINT_NONE) ? EINA_FALSE : EINA_TRUE; 13723 scale_hint = (img->image.scale_hint == EVAS_IMAGE_SCALE_HINT_NONE) ? EINA_FALSE : EINA_TRUE;
13724 border_no_fill = (img->image.border.no_fill == 0) ? EINA_FALSE : EINA_TRUE; 13724 border_no_fill = (img->image.border.no_fill == 0) ? EINA_FALSE : EINA_TRUE;
13725 border_scale = (img->image.border.scale == 0) ? EINA_FALSE : EINA_TRUE; 13725 border_scale = (img->image.border.scale == 0) ? EINA_FALSE : EINA_TRUE;
@@ -13814,13 +13814,13 @@ fill:
13814 { 13814 {
13815 smooth = (inherit_pd_img->image.fill.smooth == img->image.fill.smooth) ? EINA_FALSE : EINA_TRUE; 13815 smooth = (inherit_pd_img->image.fill.smooth == img->image.fill.smooth) ? EINA_FALSE : EINA_TRUE;
13816 type = (inherit_pd_img->image.fill.type == img->image.fill.type) ? EINA_FALSE : EINA_TRUE; 13816 type = (inherit_pd_img->image.fill.type == img->image.fill.type) ? EINA_FALSE : EINA_TRUE;
13817 orig_rel = ((inherit_pd_img->image.fill.pos_rel_x == img->image.fill.pos_rel_x) && 13817 orig_rel = (EQ(inherit_pd_img->image.fill.pos_rel_x, img->image.fill.pos_rel_x) &&
13818 (inherit_pd_img->image.fill.pos_rel_y == img->image.fill.pos_rel_y)) ? EINA_FALSE : EINA_TRUE; 13818 EQ(inherit_pd_img->image.fill.pos_rel_y, img->image.fill.pos_rel_y)) ? EINA_FALSE : EINA_TRUE;
13819 orig_abs = ((inherit_pd_img->image.fill.pos_abs_x == img->image.fill.pos_abs_x) && 13819 orig_abs = ((inherit_pd_img->image.fill.pos_abs_x == img->image.fill.pos_abs_x) &&
13820 (inherit_pd_img->image.fill.pos_abs_y == img->image.fill.pos_abs_y)) ? EINA_FALSE : EINA_TRUE; 13820 (inherit_pd_img->image.fill.pos_abs_y == img->image.fill.pos_abs_y)) ? EINA_FALSE : EINA_TRUE;
13821 13821
13822 size_rel = ((inherit_pd_img->image.fill.rel_x == img->image.fill.rel_x) && 13822 size_rel = (EQ(inherit_pd_img->image.fill.rel_x, img->image.fill.rel_x) &&
13823 (inherit_pd_img->image.fill.rel_y == img->image.fill.rel_y)) ? EINA_FALSE : EINA_TRUE; 13823 EQ(inherit_pd_img->image.fill.rel_y, img->image.fill.rel_y)) ? EINA_FALSE : EINA_TRUE;
13824 size_abs = ((inherit_pd_img->image.fill.abs_x == img->image.fill.abs_x) && 13824 size_abs = ((inherit_pd_img->image.fill.abs_x == img->image.fill.abs_x) &&
13825 (inherit_pd_img->image.fill.abs_y == img->image.fill.abs_y)) ? EINA_FALSE : EINA_TRUE; 13825 (inherit_pd_img->image.fill.abs_y == img->image.fill.abs_y)) ? EINA_FALSE : EINA_TRUE;
13826 } 13826 }
@@ -13828,9 +13828,9 @@ fill:
13828 { 13828 {
13829 smooth = (img->image.fill.smooth == 1) ? EINA_FALSE : EINA_TRUE; 13829 smooth = (img->image.fill.smooth == 1) ? EINA_FALSE : EINA_TRUE;
13830 type = (img->image.fill.type == EDJE_FILL_TYPE_SCALE) ? EINA_FALSE : EINA_TRUE; 13830 type = (img->image.fill.type == EDJE_FILL_TYPE_SCALE) ? EINA_FALSE : EINA_TRUE;
13831 orig_rel = ((img->image.fill.pos_rel_x == 0) && (img->image.fill.pos_rel_y == 0)) ? EINA_FALSE : EINA_TRUE; 13831 orig_rel = (EQ(img->image.fill.pos_rel_x, ZERO) && EQ(img->image.fill.pos_rel_y, ZERO)) ? EINA_FALSE : EINA_TRUE;
13832 orig_abs = ((img->image.fill.pos_abs_x == 0) && (img->image.fill.pos_abs_y == 0)) ? EINA_FALSE : EINA_TRUE; 13832 orig_abs = ((img->image.fill.pos_abs_x == 0) && (img->image.fill.pos_abs_y == 0)) ? EINA_FALSE : EINA_TRUE;
13833 size_rel = ((TO_DOUBLE(img->image.fill.rel_x) == 1) && (TO_DOUBLE(img->image.fill.rel_y) == 1)) ? EINA_FALSE : EINA_TRUE; 13833 size_rel = (EQ(img->image.fill.rel_x, FROM_INT(1)) && EQ(img->image.fill.rel_y, FROM_INT(1))) ? EINA_FALSE : EINA_TRUE;
13834 size_abs = ((img->image.fill.abs_x == 0) && (img->image.fill.abs_y == 0)) ? EINA_FALSE : EINA_TRUE; 13834 size_abs = ((img->image.fill.abs_x == 0) && (img->image.fill.abs_y == 0)) ? EINA_FALSE : EINA_TRUE;
13835 } 13835 }
13836 13836
@@ -13958,9 +13958,9 @@ _edje_generate_source_state_map(Edje *ed,
13958 alpha = (inherit_pd->map.alpha == pd->map.alpha) ? EINA_FALSE : EINA_TRUE; 13958 alpha = (inherit_pd->map.alpha == pd->map.alpha) ? EINA_FALSE : EINA_TRUE;
13959 13959
13960 center = (inherit_pd->map.rot.id_center == pd->map.rot.id_center) ? EINA_FALSE : EINA_TRUE; 13960 center = (inherit_pd->map.rot.id_center == pd->map.rot.id_center) ? EINA_FALSE : EINA_TRUE;
13961 x = (inherit_pd->map.rot.x == pd->map.rot.x) ? EINA_FALSE : EINA_TRUE; 13961 x = EQ(inherit_pd->map.rot.x, pd->map.rot.x) ? EINA_FALSE : EINA_TRUE;
13962 y = (inherit_pd->map.rot.y == pd->map.rot.y) ? EINA_FALSE : EINA_TRUE; 13962 y = EQ(inherit_pd->map.rot.y, pd->map.rot.y) ? EINA_FALSE : EINA_TRUE;
13963 z = (inherit_pd->map.rot.z == pd->map.rot.z) ? EINA_FALSE : EINA_TRUE; 13963 z = EQ(inherit_pd->map.rot.z, pd->map.rot.z) ? EINA_FALSE : EINA_TRUE;
13964 } 13964 }
13965 else 13965 else
13966 { 13966 {
@@ -13974,9 +13974,9 @@ _edje_generate_source_state_map(Edje *ed,
13974 alpha = (pd->map.alpha == EINA_TRUE) ? EINA_FALSE : EINA_TRUE; 13974 alpha = (pd->map.alpha == EINA_TRUE) ? EINA_FALSE : EINA_TRUE;
13975 13975
13976 center = (pd->map.rot.id_center == -1) ? EINA_FALSE : EINA_TRUE; 13976 center = (pd->map.rot.id_center == -1) ? EINA_FALSE : EINA_TRUE;
13977 x = (TO_DOUBLE(pd->map.rot.x == 0)) ? EINA_FALSE : EINA_TRUE; 13977 x = EQ(pd->map.rot.x, ZERO) ? EINA_FALSE : EINA_TRUE;
13978 y = (TO_DOUBLE(pd->map.rot.y == 0)) ? EINA_FALSE : EINA_TRUE; 13978 y = EQ(pd->map.rot.y, ZERO) ? EINA_FALSE : EINA_TRUE;
13979 z = (TO_DOUBLE(pd->map.rot.z == 0)) ? EINA_FALSE : EINA_TRUE; 13979 z = EQ(pd->map.rot.z, ZERO) ? EINA_FALSE : EINA_TRUE;
13980 } 13980 }
13981 13981
13982 attr_amount = persp + light + colors_count + backcull + on + persp_on + smooth + alpha; 13982 attr_amount = persp + light + colors_count + backcull + on + persp_on + smooth + alpha;
@@ -14160,13 +14160,13 @@ fill_proxy:
14160 { 14160 {
14161 smooth = (inherit_pd_pro->proxy.fill.smooth == pro->proxy.fill.smooth) ? EINA_FALSE : EINA_TRUE; 14161 smooth = (inherit_pd_pro->proxy.fill.smooth == pro->proxy.fill.smooth) ? EINA_FALSE : EINA_TRUE;
14162 type = (inherit_pd_pro->proxy.fill.type == pro->proxy.fill.type) ? EINA_FALSE : EINA_TRUE; 14162 type = (inherit_pd_pro->proxy.fill.type == pro->proxy.fill.type) ? EINA_FALSE : EINA_TRUE;
14163 orig_rel = ((inherit_pd_pro->proxy.fill.pos_rel_x == pro->proxy.fill.pos_rel_x) && 14163 orig_rel = (EQ(inherit_pd_pro->proxy.fill.pos_rel_x, pro->proxy.fill.pos_rel_x) &&
14164 (inherit_pd_pro->proxy.fill.pos_rel_y == pro->proxy.fill.pos_rel_y)) ? EINA_FALSE : EINA_TRUE; 14164 EQ(inherit_pd_pro->proxy.fill.pos_rel_y, pro->proxy.fill.pos_rel_y)) ? EINA_FALSE : EINA_TRUE;
14165 orig_abs = ((inherit_pd_pro->proxy.fill.pos_abs_x == pro->proxy.fill.pos_abs_x) && 14165 orig_abs = ((inherit_pd_pro->proxy.fill.pos_abs_x == pro->proxy.fill.pos_abs_x) &&
14166 (inherit_pd_pro->proxy.fill.pos_abs_y == pro->proxy.fill.pos_abs_y)) ? EINA_FALSE : EINA_TRUE; 14166 (inherit_pd_pro->proxy.fill.pos_abs_y == pro->proxy.fill.pos_abs_y)) ? EINA_FALSE : EINA_TRUE;
14167 14167
14168 size_rel = ((inherit_pd_pro->proxy.fill.rel_x == pro->proxy.fill.rel_x) && 14168 size_rel = (EQ(inherit_pd_pro->proxy.fill.rel_x, pro->proxy.fill.rel_x) &&
14169 (inherit_pd_pro->proxy.fill.rel_y == pro->proxy.fill.rel_y)) ? EINA_FALSE : EINA_TRUE; 14169 EQ(inherit_pd_pro->proxy.fill.rel_y, pro->proxy.fill.rel_y)) ? EINA_FALSE : EINA_TRUE;
14170 size_abs = ((inherit_pd_pro->proxy.fill.abs_x == pro->proxy.fill.abs_x) && 14170 size_abs = ((inherit_pd_pro->proxy.fill.abs_x == pro->proxy.fill.abs_x) &&
14171 (inherit_pd_pro->proxy.fill.abs_y == pro->proxy.fill.abs_y)) ? EINA_FALSE : EINA_TRUE; 14171 (inherit_pd_pro->proxy.fill.abs_y == pro->proxy.fill.abs_y)) ? EINA_FALSE : EINA_TRUE;
14172 } 14172 }
@@ -14174,9 +14174,9 @@ fill_proxy:
14174 { 14174 {
14175 smooth = (pro->proxy.fill.smooth == 1) ? EINA_FALSE : EINA_TRUE; 14175 smooth = (pro->proxy.fill.smooth == 1) ? EINA_FALSE : EINA_TRUE;
14176 type = (pro->proxy.fill.type == EDJE_FILL_TYPE_SCALE) ? EINA_FALSE : EINA_TRUE; 14176 type = (pro->proxy.fill.type == EDJE_FILL_TYPE_SCALE) ? EINA_FALSE : EINA_TRUE;
14177 orig_rel = ((pro->proxy.fill.pos_rel_x == 0) && (pro->proxy.fill.pos_rel_y == 0)) ? EINA_FALSE : EINA_TRUE; 14177 orig_rel = (EQ(pro->proxy.fill.pos_rel_x, ZERO) && EQ(pro->proxy.fill.pos_rel_y, ZERO)) ? EINA_FALSE : EINA_TRUE;
14178 orig_abs = ((pro->proxy.fill.pos_abs_x == 0) && (pro->proxy.fill.pos_abs_y == 0)) ? EINA_FALSE : EINA_TRUE; 14178 orig_abs = ((pro->proxy.fill.pos_abs_x == 0) && (pro->proxy.fill.pos_abs_y == 0)) ? EINA_FALSE : EINA_TRUE;
14179 size_rel = ((TO_DOUBLE(pro->proxy.fill.rel_x) == 1) && (TO_DOUBLE(pro->proxy.fill.rel_y) == 1)) ? EINA_FALSE : EINA_TRUE; 14179 size_rel = (EQ(pro->proxy.fill.rel_x, FROM_INT(1)) && EQ(pro->proxy.fill.rel_y, FROM_INT(1))) ? EINA_FALSE : EINA_TRUE;
14180 size_abs = ((pro->proxy.fill.abs_x == 0) && (pro->proxy.fill.abs_y == 0)) ? EINA_FALSE : EINA_TRUE; 14180 size_abs = ((pro->proxy.fill.abs_x == 0) && (pro->proxy.fill.abs_y == 0)) ? EINA_FALSE : EINA_TRUE;
14181 } 14181 }
14182 14182
@@ -14291,8 +14291,8 @@ _edje_generate_source_state_table(Edje_Part_Description_Common *pd,
14291 { 14291 {
14292 homogeneous = (inherit_pd_table->table.homogeneous == table->table.homogeneous) ? EINA_FALSE : EINA_TRUE; 14292 homogeneous = (inherit_pd_table->table.homogeneous == table->table.homogeneous) ? EINA_FALSE : EINA_TRUE;
14293 14293
14294 align = ((inherit_pd_table->table.align.x == table->table.align.x) && 14294 align = (EQ(inherit_pd_table->table.align.x, table->table.align.x) &&
14295 (inherit_pd_table->table.align.y == table->table.align.y)) ? EINA_FALSE : EINA_TRUE; 14295 EQ(inherit_pd_table->table.align.y, table->table.align.y)) ? EINA_FALSE : EINA_TRUE;
14296 14296
14297 padding = ((inherit_pd_table->table.padding.x == table->table.padding.x) && 14297 padding = ((inherit_pd_table->table.padding.x == table->table.padding.x) &&
14298 (inherit_pd_table->table.padding.y == table->table.padding.y)) ? EINA_FALSE : EINA_TRUE; 14298 (inherit_pd_table->table.padding.y == table->table.padding.y)) ? EINA_FALSE : EINA_TRUE;
@@ -14303,7 +14303,7 @@ _edje_generate_source_state_table(Edje_Part_Description_Common *pd,
14303 else 14303 else
14304 { 14304 {
14305 homogeneous = (table->table.homogeneous == EDJE_OBJECT_TABLE_HOMOGENEOUS_NONE) ? EINA_FALSE : EINA_TRUE; 14305 homogeneous = (table->table.homogeneous == EDJE_OBJECT_TABLE_HOMOGENEOUS_NONE) ? EINA_FALSE : EINA_TRUE;
14306 align = (table->table.align.x == 0.5 && table->table.align.y == 0.5) ? EINA_FALSE : EINA_TRUE; 14306 align = (EQ(table->table.align.x, FROM_DOUBLE(0.5)) && EQ(table->table.align.y, FROM_DOUBLE(0.5))) ? EINA_FALSE : EINA_TRUE;
14307 padding = (table->table.padding.x == 0 && table->table.padding.y == 0) ? EINA_FALSE : EINA_TRUE; 14307 padding = (table->table.padding.x == 0 && table->table.padding.y == 0) ? EINA_FALSE : EINA_TRUE;
14308 min = (table->table.min.h == 0 && table->table.min.v == 0) ? EINA_FALSE : EINA_TRUE; 14308 min = (table->table.min.h == 0 && table->table.min.v == 0) ? EINA_FALSE : EINA_TRUE;
14309 } 14309 }
@@ -14389,8 +14389,8 @@ _edje_generate_source_state_box(Edje_Part_Description_Common *pd,
14389 !strcmp(inherit_pd_box->box.alt_layout, box->box.alt_layout)) || 14389 !strcmp(inherit_pd_box->box.alt_layout, box->box.alt_layout)) ||
14390 (inherit_pd_box->box.alt_layout == NULL && box->box.alt_layout == NULL)) ? EINA_FALSE : EINA_TRUE; 14390 (inherit_pd_box->box.alt_layout == NULL && box->box.alt_layout == NULL)) ? EINA_FALSE : EINA_TRUE;
14391 14391
14392 align = ((inherit_pd_box->box.align.x == box->box.align.x) && 14392 align = (EQ(inherit_pd_box->box.align.x, box->box.align.x) &&
14393 (inherit_pd_box->box.align.y == box->box.align.y)) ? EINA_FALSE : EINA_TRUE; 14393 EQ(inherit_pd_box->box.align.y, box->box.align.y)) ? EINA_FALSE : EINA_TRUE;
14394 14394
14395 padding = ((inherit_pd_box->box.padding.x == box->box.padding.x) && 14395 padding = ((inherit_pd_box->box.padding.x == box->box.padding.x) &&
14396 (inherit_pd_box->box.padding.y == box->box.padding.y)) ? EINA_FALSE : EINA_TRUE; 14396 (inherit_pd_box->box.padding.y == box->box.padding.y)) ? EINA_FALSE : EINA_TRUE;
@@ -14402,7 +14402,7 @@ _edje_generate_source_state_box(Edje_Part_Description_Common *pd,
14402 { 14402 {
14403 layout = (box->box.layout == NULL) ? EINA_FALSE : EINA_TRUE; 14403 layout = (box->box.layout == NULL) ? EINA_FALSE : EINA_TRUE;
14404 alt_layout = (box->box.alt_layout == NULL) ? EINA_FALSE : EINA_TRUE; 14404 alt_layout = (box->box.alt_layout == NULL) ? EINA_FALSE : EINA_TRUE;
14405 align = (box->box.align.x == 0.5 && box->box.align.y == 0.5) ? EINA_FALSE : EINA_TRUE; 14405 align = EQ(box->box.align.x, FROM_DOUBLE(0.5)) && EQ(box->box.align.y, FROM_DOUBLE(0.5)) ? EINA_FALSE : EINA_TRUE;
14406 padding = (box->box.padding.x == 0 && box->box.padding.y == 0) ? EINA_FALSE : EINA_TRUE; 14406 padding = (box->box.padding.x == 0 && box->box.padding.y == 0) ? EINA_FALSE : EINA_TRUE;
14407 min = (box->box.min.h == 0 && box->box.min.v == 0) ? EINA_FALSE : EINA_TRUE; 14407 min = (box->box.min.h == 0 && box->box.min.v == 0) ? EINA_FALSE : EINA_TRUE;
14408 } 14408 }
@@ -14519,15 +14519,15 @@ _edje_generate_source_state_text(Edje *ed, Edje_Part_Description_Common *pd,
14519 max = ((inherit_pd_txt->text.max_x == txt->text.max_x) && 14519 max = ((inherit_pd_txt->text.max_x == txt->text.max_x) &&
14520 (inherit_pd_txt->text.max_y == txt->text.max_y)) ? EINA_FALSE : EINA_TRUE; 14520 (inherit_pd_txt->text.max_y == txt->text.max_y)) ? EINA_FALSE : EINA_TRUE;
14521 14521
14522 align = ((inherit_pd_txt->text.align.x == txt->text.align.x) && 14522 align = (EQ(inherit_pd_txt->text.align.x, txt->text.align.x) &&
14523 (inherit_pd_txt->text.align.y == txt->text.align.y)) ? EINA_FALSE : EINA_TRUE; 14523 EQ(inherit_pd_txt->text.align.y, txt->text.align.y)) ? EINA_FALSE : EINA_TRUE;
14524 14524
14525 source = ((inherit_pd_txt->text.id_source == txt->text.id_source)) ? EINA_FALSE : EINA_TRUE; 14525 source = ((inherit_pd_txt->text.id_source == txt->text.id_source)) ? EINA_FALSE : EINA_TRUE;
14526 14526
14527 text_source = ((inherit_pd_txt->text.id_text_source == txt->text.id_text_source)) ? EINA_FALSE : EINA_TRUE; 14527 text_source = ((inherit_pd_txt->text.id_text_source == txt->text.id_text_source)) ? EINA_FALSE : EINA_TRUE;
14528 14528
14529 14529
14530 ellipsis = ((inherit_pd_txt->text.ellipsis == txt->text.ellipsis)) ? EINA_FALSE : EINA_TRUE; 14530 ellipsis = (EQ(inherit_pd_txt->text.ellipsis, txt->text.ellipsis)) ? EINA_FALSE : EINA_TRUE;
14531 14531
14532 style = (edje_string_id_get(&inherit_pd_txt->text.style) == 14532 style = (edje_string_id_get(&inherit_pd_txt->text.style) ==
14533 edje_string_id_get(&txt->text.style)) ? EINA_FALSE : EINA_TRUE; 14533 edje_string_id_get(&txt->text.style)) ? EINA_FALSE : EINA_TRUE;
@@ -14550,10 +14550,10 @@ _edje_generate_source_state_text(Edje *ed, Edje_Part_Description_Common *pd,
14550 fit = ((txt->text.fit_x == 0) && (txt->text.fit_y == 0)) ? EINA_FALSE : EINA_TRUE; 14550 fit = ((txt->text.fit_x == 0) && (txt->text.fit_y == 0)) ? EINA_FALSE : EINA_TRUE;
14551 min = ((txt->text.min_x == 0) && (txt->text.min_y == 0)) ? EINA_FALSE : EINA_TRUE; 14551 min = ((txt->text.min_x == 0) && (txt->text.min_y == 0)) ? EINA_FALSE : EINA_TRUE;
14552 max = ((txt->text.max_x == 0) && (txt->text.max_y == 0)) ? EINA_FALSE : EINA_TRUE; 14552 max = ((txt->text.max_x == 0) && (txt->text.max_y == 0)) ? EINA_FALSE : EINA_TRUE;
14553 align = ((txt->text.align.x == 0.5) && (txt->text.align.y == 0.5)) ? EINA_FALSE : EINA_TRUE; 14553 align = (EQ(txt->text.align.x, FROM_DOUBLE(0.5)) && EQ(txt->text.align.y, FROM_DOUBLE(0.5))) ? EINA_FALSE : EINA_TRUE;
14554 source = (txt->text.id_source == -1) ? EINA_FALSE : EINA_TRUE; 14554 source = (txt->text.id_source == -1) ? EINA_FALSE : EINA_TRUE;
14555 text_source = (txt->text.id_text_source == -1) ? EINA_FALSE : EINA_TRUE; 14555 text_source = (txt->text.id_text_source == -1) ? EINA_FALSE : EINA_TRUE;
14556 ellipsis = (txt->text.ellipsis == 0) ? EINA_FALSE : EINA_TRUE; 14556 ellipsis = EQ(txt->text.ellipsis, ZERO) ? EINA_FALSE : EINA_TRUE;
14557 style = (edje_string_id_get(&txt->text.style) == 0) ? EINA_FALSE : EINA_TRUE; 14557 style = (edje_string_id_get(&txt->text.style) == 0) ? EINA_FALSE : EINA_TRUE;
14558 color_3 = ((txt->text.color3.r == 0) && (txt->text.color3.g == 0) && 14558 color_3 = ((txt->text.color3.r == 0) && (txt->text.color3.g == 0) &&
14559 (txt->text.color3.b == 0) && (txt->text.color3.a == 128)) ? EINA_FALSE : EINA_TRUE; 14559 (txt->text.color3.b == 0) && (txt->text.color3.a == 128)) ? EINA_FALSE : EINA_TRUE;
@@ -14662,17 +14662,17 @@ _edje_common_desc_diff_calculate(Edje_Part_Description_Common *ed,
14662{ 14662{
14663 int diffs_amount= 0; 14663 int diffs_amount= 0;
14664 14664
14665 diffs_amount += ((ed->align.x != inherit_pd->align.x) || (ed->align.y != inherit_pd->align.y)) ? 1 : 0; 14665 diffs_amount += (NEQ(ed->align.x, inherit_pd->align.x) || NEQ(ed->align.y, inherit_pd->align.y)) ? 1 : 0;
14666 14666
14667 diffs_amount += ((ed->minmul.have != inherit_pd->minmul.have) || 14667 diffs_amount += ((ed->minmul.have != inherit_pd->minmul.have) ||
14668 (ed->minmul.w != inherit_pd->minmul.w) || 14668 NEQ(ed->minmul.w, inherit_pd->minmul.w) ||
14669 (ed->minmul.h != inherit_pd->minmul.h)) ? 1 : 0; 14669 NEQ(ed->minmul.h, inherit_pd->minmul.h)) ? 1 : 0;
14670 diffs_amount += ((ed->min.w != inherit_pd->min.w) || 14670 diffs_amount += ((ed->min.w != inherit_pd->min.w) ||
14671 (ed->min.h != inherit_pd->min.h) || 14671 (ed->min.h != inherit_pd->min.h) ||
14672 (ed->min.limit != inherit_pd->min.limit)) ? 1 : 0; 14672 (ed->min.limit != inherit_pd->min.limit)) ? 1 : 0;
14673 diffs_amount += ((ed->step.x != inherit_pd->step.x) || (ed->step.y != inherit_pd->step.y)) ? 1 : 0; 14673 diffs_amount += ((ed->step.x != inherit_pd->step.x) || (ed->step.y != inherit_pd->step.y)) ? 1 : 0;
14674 diffs_amount += ((ed->aspect.min != inherit_pd->aspect.min) || 14674 diffs_amount += (NEQ(ed->aspect.min, inherit_pd->aspect.min) ||
14675 (ed->aspect.max != inherit_pd->aspect.max) || 14675 NEQ(ed->aspect.max, inherit_pd->aspect.max) ||
14676 (ed->aspect.prefer!= inherit_pd->aspect.prefer)) ? 1 : 0; 14676 (ed->aspect.prefer!= inherit_pd->aspect.prefer)) ? 1 : 0;
14677 diffs_amount += ((ed->color_class != NULL && inherit_pd->color_class == NULL) || 14677 diffs_amount += ((ed->color_class != NULL && inherit_pd->color_class == NULL) ||
14678 (ed->color_class == NULL && inherit_pd->color_class != NULL) || 14678 (ed->color_class == NULL && inherit_pd->color_class != NULL) ||
@@ -14685,8 +14685,8 @@ _edje_common_desc_diff_calculate(Edje_Part_Description_Common *ed,
14685 strcmp(ed->size_class, inherit_pd->size_class))) ? 1 : 0; 14685 strcmp(ed->size_class, inherit_pd->size_class))) ? 1 : 0;
14686 14686
14687 /*Rel1 block*/ 14687 /*Rel1 block*/
14688 diffs_amount += ((ed->rel1.relative_x != inherit_pd->rel1.relative_x) || 14688 diffs_amount += (NEQ(ed->rel1.relative_x, inherit_pd->rel1.relative_x) ||
14689 (ed->rel1.relative_y != inherit_pd->rel1.relative_y)) ? 1 : 0; 14689 NEQ(ed->rel1.relative_y, inherit_pd->rel1.relative_y)) ? 1 : 0;
14690 diffs_amount += ((ed->rel1.offset_x != inherit_pd->rel1.offset_x) || 14690 diffs_amount += ((ed->rel1.offset_x != inherit_pd->rel1.offset_x) ||
14691 (ed->rel1.offset_y != inherit_pd->rel1.offset_y)) ? 1 : 0; 14691 (ed->rel1.offset_y != inherit_pd->rel1.offset_y)) ? 1 : 0;
14692 diffs_amount += (ed->rel1.id_x != inherit_pd->rel1.id_x) ? 1 : 0; 14692 diffs_amount += (ed->rel1.id_x != inherit_pd->rel1.id_x) ? 1 : 0;
@@ -14694,8 +14694,8 @@ _edje_common_desc_diff_calculate(Edje_Part_Description_Common *ed,
14694 /*End of Rel1 block*/ 14694 /*End of Rel1 block*/
14695 14695
14696 /*Rel2 block*/ 14696 /*Rel2 block*/
14697 diffs_amount += ((ed->rel2.relative_x != inherit_pd->rel2.relative_x) || 14697 diffs_amount += (NEQ(ed->rel2.relative_x, inherit_pd->rel2.relative_x) ||
14698 (ed->rel2.relative_y != inherit_pd->rel2.relative_y)) ? 1 : 0; 14698 NEQ(ed->rel2.relative_y, inherit_pd->rel2.relative_y)) ? 1 : 0;
14699 diffs_amount += ((ed->rel2.offset_x != inherit_pd->rel2.offset_x) || 14699 diffs_amount += ((ed->rel2.offset_x != inherit_pd->rel2.offset_x) ||
14700 (ed->rel2.offset_y != inherit_pd->rel2.offset_y)) ? 1 : 0; 14700 (ed->rel2.offset_y != inherit_pd->rel2.offset_y)) ? 1 : 0;
14701 diffs_amount += (ed->rel2.id_x != inherit_pd->rel2.id_x) ? 1 : 0; 14701 diffs_amount += (ed->rel2.id_x != inherit_pd->rel2.id_x) ? 1 : 0;
@@ -14714,9 +14714,9 @@ _edje_common_desc_diff_calculate(Edje_Part_Description_Common *ed,
14714 diffs_amount += (inherit_pd->map.alpha == ed->map.alpha) ? EINA_FALSE : EINA_TRUE; 14714 diffs_amount += (inherit_pd->map.alpha == ed->map.alpha) ? EINA_FALSE : EINA_TRUE;
14715 14715
14716 diffs_amount += (inherit_pd->map.rot.id_center == ed->map.rot.id_center) ? EINA_FALSE : EINA_TRUE; 14716 diffs_amount += (inherit_pd->map.rot.id_center == ed->map.rot.id_center) ? EINA_FALSE : EINA_TRUE;
14717 diffs_amount += (inherit_pd->map.rot.x == ed->map.rot.x) ? EINA_FALSE : EINA_TRUE; 14717 diffs_amount += EQ(inherit_pd->map.rot.x, ed->map.rot.x) ? EINA_FALSE : EINA_TRUE;
14718 diffs_amount += (inherit_pd->map.rot.y == ed->map.rot.y) ? EINA_FALSE : EINA_TRUE; 14718 diffs_amount += EQ(inherit_pd->map.rot.y, ed->map.rot.y) ? EINA_FALSE : EINA_TRUE;
14719 diffs_amount += (inherit_pd->map.rot.z == ed->map.rot.z) ? EINA_FALSE : EINA_TRUE; 14719 diffs_amount += EQ(inherit_pd->map.rot.z, ed->map.rot.z) ? EINA_FALSE : EINA_TRUE;
14720 14720
14721 /*In case when colors are equal do not append points into diffs_amount*/ 14721 /*In case when colors are equal do not append points into diffs_amount*/
14722 diffs_amount += ((ed->color.r == inherit_pd->color.r) && 14722 diffs_amount += ((ed->color.r == inherit_pd->color.r) &&
@@ -14766,9 +14766,9 @@ _edje_text_desc_diff_calculate(Edje_Part_Description_Common *ed, Edje_Part_Descr
14766 (ed_text->text.font.str != NULL && inherit_pd_text->text.font.str != NULL && 14766 (ed_text->text.font.str != NULL && inherit_pd_text->text.font.str != NULL &&
14767 strcmp(ed_text->text.font.str, inherit_pd_text->text.font.str))) ? 1 : 0; 14767 strcmp(ed_text->text.font.str, inherit_pd_text->text.font.str))) ? 1 : 0;
14768 14768
14769 diffs_amount += ((ed_text->text.align.x != inherit_pd_text->text.align.x) || 14769 diffs_amount += (NEQ(ed_text->text.align.x, inherit_pd_text->text.align.x) ||
14770 (ed_text->text.align.y != inherit_pd_text->text.align.y)) ? 1 : 0; 14770 NEQ(ed_text->text.align.y, inherit_pd_text->text.align.y)) ? 1 : 0;
14771 diffs_amount += (ed_text->text.ellipsis != inherit_pd_text->text.ellipsis) ? 1 : 0; 14771 diffs_amount += NEQ(ed_text->text.ellipsis, inherit_pd_text->text.ellipsis) ? 1 : 0;
14772 diffs_amount += (ed_text->text.size != inherit_pd_text->text.size) ? 1 : 0; 14772 diffs_amount += (ed_text->text.size != inherit_pd_text->text.size) ? 1 : 0;
14773 diffs_amount += (ed_text->text.id_source != inherit_pd_text->text.id_source) ? 1 : 0; 14773 diffs_amount += (ed_text->text.id_source != inherit_pd_text->text.id_source) ? 1 : 0;
14774 diffs_amount += (ed_text->text.id_text_source != inherit_pd_text->text.id_text_source) ? 1 : 0; 14774 diffs_amount += (ed_text->text.id_text_source != inherit_pd_text->text.id_text_source) ? 1 : 0;
@@ -14808,7 +14808,7 @@ _edje_image_desc_diff_calculate(Edje_Edit *eed,
14808 14808
14809 diffs_amount += (image_pd->image.border.scale == inherit_pd_image->image.border.scale) ? EINA_FALSE : EINA_TRUE; 14809 diffs_amount += (image_pd->image.border.scale == inherit_pd_image->image.border.scale) ? EINA_FALSE : EINA_TRUE;
14810 14810
14811 diffs_amount += (image_pd->image.border.scale_by == inherit_pd_image->image.border.scale_by) ? EINA_FALSE : EINA_TRUE; 14811 diffs_amount += EQ(image_pd->image.border.scale_by, inherit_pd_image->image.border.scale_by) ? EINA_FALSE : EINA_TRUE;
14812 14812
14813 diffs_amount += (image_pd->image.scale_hint == inherit_pd_image->image.scale_hint) ? EINA_FALSE : EINA_TRUE; 14813 diffs_amount += (image_pd->image.scale_hint == inherit_pd_image->image.scale_hint) ? EINA_FALSE : EINA_TRUE;
14814 14814
@@ -14836,7 +14836,7 @@ _edje_generate_source_of_state_inherit(Edje_Edit *eed EINA_UNUSED, Edje_Part *ep
14836 Edje_Part_Description_Common *inherit = NULL; 14836 Edje_Part_Description_Common *inherit = NULL;
14837 Edje_Part_Description_Common *desc = NULL; 14837 Edje_Part_Description_Common *desc = NULL;
14838 14838
14839 if (pd->state.value == 0 && !strcmp(pd->state.name, "default")) 14839 if (EQ(pd->state.value, ZERO) && !strcmp(pd->state.name, "default"))
14840 return NULL; 14840 return NULL;
14841 14841
14842 /*calculate metric of difference*/ 14842 /*calculate metric of difference*/
@@ -14874,7 +14874,7 @@ _edje_generate_source_of_state_inherit(Edje_Edit *eed EINA_UNUSED, Edje_Part *ep
14874 { 14874 {
14875 desc = ep->other.desc[i]; 14875 desc = ep->other.desc[i];
14876 14876
14877 if (!strcmp(desc->state.name, pd->state.name) && (desc->state.value == pd->state.value)) 14877 if (!strcmp(desc->state.name, pd->state.name) && EQ(desc->state.value, pd->state.value))
14878 break; 14878 break;
14879 14879
14880 /*calculate metric of difference*/ 14880 /*calculate metric of difference*/
@@ -14949,8 +14949,8 @@ _edje_generate_source_of_state(Evas_Object *obj, const char *part, const char *s
14949 (inherit_pd->color_class != NULL) && 14949 (inherit_pd->color_class != NULL) &&
14950 (!strcmp(pd->color_class, inherit_pd->color_class)))) ? EINA_FALSE : EINA_TRUE; 14950 (!strcmp(pd->color_class, inherit_pd->color_class)))) ? EINA_FALSE : EINA_TRUE;
14951 14951
14952 align = ((pd->align.x == inherit_pd->align.x) && 14952 align = (EQ(pd->align.x, inherit_pd->align.x) &&
14953 (pd->align.y == inherit_pd->align.y)) ? EINA_FALSE : EINA_TRUE; 14953 EQ(pd->align.y, inherit_pd->align.y)) ? EINA_FALSE : EINA_TRUE;
14954 14954
14955 fixed = ((pd->fixed.w == inherit_pd->fixed.w) && 14955 fixed = ((pd->fixed.w == inherit_pd->fixed.w) &&
14956 (pd->fixed.h == inherit_pd->fixed.h)) ? EINA_FALSE : EINA_TRUE; 14956 (pd->fixed.h == inherit_pd->fixed.h)) ? EINA_FALSE : EINA_TRUE;
@@ -14966,8 +14966,8 @@ _edje_generate_source_of_state(Evas_Object *obj, const char *part, const char *s
14966 max_source = (pd->max.limit == inherit_pd->max.limit) ? EINA_FALSE : EINA_TRUE; 14966 max_source = (pd->max.limit == inherit_pd->max.limit) ? EINA_FALSE : EINA_TRUE;
14967 14967
14968 minmul = ((pd->minmul.have == inherit_pd->minmul.have) && 14968 minmul = ((pd->minmul.have == inherit_pd->minmul.have) &&
14969 (pd->minmul.w == inherit_pd->minmul.w) && 14969 EQ(pd->minmul.w, inherit_pd->minmul.w) &&
14970 (pd->minmul.h == inherit_pd->minmul.h)) ? EINA_FALSE : EINA_TRUE; 14970 EQ(pd->minmul.h, inherit_pd->minmul.h)) ? EINA_FALSE : EINA_TRUE;
14971 14971
14972 size_class = ((pd->size_class == inherit_pd->size_class) || 14972 size_class = ((pd->size_class == inherit_pd->size_class) ||
14973 ((pd->size_class != NULL) && (inherit_pd->size_class != NULL) && 14973 ((pd->size_class != NULL) && (inherit_pd->size_class != NULL) &&
@@ -14976,8 +14976,8 @@ _edje_generate_source_of_state(Evas_Object *obj, const char *part, const char *s
14976 step = ((pd->step.x == inherit_pd->step.x) && 14976 step = ((pd->step.x == inherit_pd->step.x) &&
14977 (pd->step.y == inherit_pd->step.y)) ? EINA_FALSE : EINA_TRUE; 14977 (pd->step.y == inherit_pd->step.y)) ? EINA_FALSE : EINA_TRUE;
14978 14978
14979 aspect = ((pd->aspect.min == inherit_pd->aspect.min) && 14979 aspect = (EQ(pd->aspect.min, inherit_pd->aspect.min) &&
14980 (pd->aspect.max == inherit_pd->aspect.max)) ? EINA_FALSE : EINA_TRUE; 14980 EQ(pd->aspect.max, inherit_pd->aspect.max)) ? EINA_FALSE : EINA_TRUE;
14981 14981
14982 aspect_prefer = (pd->aspect.prefer == inherit_pd->aspect.prefer) ? EINA_FALSE : EINA_TRUE; 14982 aspect_prefer = (pd->aspect.prefer == inherit_pd->aspect.prefer) ? EINA_FALSE : EINA_TRUE;
14983 14983
@@ -14999,7 +14999,7 @@ _edje_generate_source_of_state(Evas_Object *obj, const char *part, const char *s
14999 14999
15000 color_class = (pd->color_class == NULL) ? EINA_FALSE : EINA_TRUE; 15000 color_class = (pd->color_class == NULL) ? EINA_FALSE : EINA_TRUE;
15001 15001
15002 align = ((pd->align.x == 0.5) && (pd->align.y == 0.5)) ? EINA_FALSE : EINA_TRUE; 15002 align = (EQ(pd->align.x, FROM_DOUBLE(0.5)) && EQ(pd->align.y, FROM_DOUBLE(0.5))) ? EINA_FALSE : EINA_TRUE;
15003 15003
15004 fixed = ((pd->fixed.w == 0) && (pd->fixed.h == 0)) ? EINA_FALSE : EINA_TRUE; 15004 fixed = ((pd->fixed.w == 0) && (pd->fixed.h == 0)) ? EINA_FALSE : EINA_TRUE;
15005 15005
@@ -15010,13 +15010,13 @@ _edje_generate_source_of_state(Evas_Object *obj, const char *part, const char *s
15010 max_source = pd->max.limit; 15010 max_source = pd->max.limit;
15011 15011
15012 minmul = ((pd->minmul.have == 0) || 15012 minmul = ((pd->minmul.have == 0) ||
15013 ((pd->minmul.w == 1) && (pd->minmul.h == 1))) ? EINA_FALSE : EINA_TRUE; 15013 (EQ(pd->minmul.w, FROM_INT(1)) && EQ(pd->minmul.h, FROM_INT(1)))) ? EINA_FALSE : EINA_TRUE;
15014 15014
15015 size_class = (pd->size_class == NULL) ? EINA_FALSE : EINA_TRUE; 15015 size_class = (pd->size_class == NULL) ? EINA_FALSE : EINA_TRUE;
15016 15016
15017 step = ((pd->step.x == 0) && (pd->step.y == 0)) ? EINA_FALSE : EINA_TRUE; 15017 step = ((pd->step.x == 0) && (pd->step.y == 0)) ? EINA_FALSE : EINA_TRUE;
15018 15018
15019 aspect = ((pd->aspect.min == 0) && (pd->aspect.max == 0)) ? EINA_FALSE : EINA_TRUE; 15019 aspect = (EQ(pd->aspect.min, ZERO) && EQ(pd->aspect.max, ZERO)) ? EINA_FALSE : EINA_TRUE;
15020 15020
15021 aspect_prefer = (pd->aspect.prefer == 0) ? EINA_FALSE : EINA_TRUE; 15021 aspect_prefer = (pd->aspect.prefer == 0) ? EINA_FALSE : EINA_TRUE;
15022 15022
@@ -15357,12 +15357,12 @@ _edje_generate_source_of_part(Evas_Object *obj, Edje_Part *ep, Eina_Strbuf *buf)
15357 BUF_APPENDF(I7 "padding: %d %d %d %d;\n", 15357 BUF_APPENDF(I7 "padding: %d %d %d %d;\n",
15358 item->padding.l, item->padding.r, 15358 item->padding.l, item->padding.r,
15359 item->padding.t, item->padding.b); 15359 item->padding.t, item->padding.b);
15360 if ((item->weight.x != 0) || (item->weight.y != 0)) 15360 if (NEQ(item->weight.x, ZERO) || NEQ(item->weight.y, ZERO))
15361 _edje_source_with_double_values_append(I7 "weight", 2, 15361 _edje_source_with_double_values_append(I7 "weight", 2,
15362 TO_DOUBLE(item->weight.x), 15362 TO_DOUBLE(item->weight.x),
15363 TO_DOUBLE(item->weight.y), 15363 TO_DOUBLE(item->weight.y),
15364 buf, &ret); 15364 buf, &ret);
15365 if (TO_DOUBLE(item->align.x) != 0.5 || TO_DOUBLE(item->align.y) != 0.5) 15365 if (NEQ(item->align.x, FROM_DOUBLE(0.5)) || NEQ(item->align.y, FROM_DOUBLE(0.5)))
15366 _edje_source_with_double_values_append(I7 "align", 2, 15366 _edje_source_with_double_values_append(I7 "align", 2,
15367 TO_DOUBLE(item->align.x), 15367 TO_DOUBLE(item->align.x),
15368 TO_DOUBLE(item->align.y), 15368 TO_DOUBLE(item->align.y),