summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKateryna Fesyna <k.fesyna@samsung.com>2014-11-14 06:58:19 +0100
committerCedric BAIL <cedric@osg.samsung.com>2014-11-14 07:34:13 +0100
commitf75907b6168780721281f41cf40fbfbf02da22bc (patch)
tree5d613a777b7cc840a9f5551e5b155cb5cdcf446e
parenta402d4138ac64000a4240fca733f2edd8f4b3e6c (diff)
edje: fix wrong generation of 'minmul' and 'text.min' parameters in EDC.
Summary: minmul: add check of 'minmul.have' value and fix check on default vales of minmul (0.0 0.0 -> 1.0 1.0) min: delete quotation marks from 'w' and 'h' values @fix Reviewers: Hermet, raster, cedric Reviewed By: cedric Subscribers: cedric, reutskiy.v.v Differential Revision: https://phab.enlightenment.org/D1658 Signed-off-by: Cedric BAIL <cedric@osg.samsung.com>
-rw-r--r--src/lib/edje/edje_edit.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/edje/edje_edit.c b/src/lib/edje/edje_edit.c
index 5b952b06f8..9fb6d6cf89 100644
--- a/src/lib/edje/edje_edit.c
+++ b/src/lib/edje/edje_edit.c
@@ -10092,7 +10092,7 @@ _edje_generate_source_of_state(Evas_Object *obj, const char *part, const char *s
10092 BUF_APPENDF(I5"min: %d %d;\n", pd->min.w, pd->min.h); 10092 BUF_APPENDF(I5"min: %d %d;\n", pd->min.w, pd->min.h);
10093 if (pd->max.w != -1 || pd->max.h != -1) 10093 if (pd->max.w != -1 || pd->max.h != -1)
10094 BUF_APPENDF(I5"max: %d %d;\n", pd->max.w, pd->max.h); 10094 BUF_APPENDF(I5"max: %d %d;\n", pd->max.w, pd->max.h);
10095 if (pd->minmul.w != 0 || pd->minmul.h != 0) 10095 if ((pd->minmul.have) && (pd->minmul.w != 1 || pd->minmul.h != 1))
10096 BUF_APPENDF(I5"minmul: %g %g;\n", TO_DOUBLE(pd->minmul.w), TO_DOUBLE(pd->minmul.h)); 10096 BUF_APPENDF(I5"minmul: %g %g;\n", TO_DOUBLE(pd->minmul.w), TO_DOUBLE(pd->minmul.h));
10097 10097
10098 if (pd->step.x && pd->step.y) 10098 if (pd->step.x && pd->step.y)
@@ -10382,7 +10382,7 @@ _edje_generate_source_of_state(Evas_Object *obj, const char *part, const char *s
10382 if (txt->text.fit_x || txt->text.fit_y) 10382 if (txt->text.fit_x || txt->text.fit_y)
10383 BUF_APPENDF(I6"fit: %d %d;\n", txt->text.fit_x, txt->text.fit_y); 10383 BUF_APPENDF(I6"fit: %d %d;\n", txt->text.fit_x, txt->text.fit_y);
10384 if (txt->text.min_x || txt->text.min_y) 10384 if (txt->text.min_x || txt->text.min_y)
10385 BUF_APPENDF(I6"min: \"%d\" \"%d\";\n", txt->text.min_x, txt->text.min_y); 10385 BUF_APPENDF(I6"min: %d %d;\n", txt->text.min_x, txt->text.min_y);
10386 if (txt->text.max_x || txt->text.max_y) 10386 if (txt->text.max_x || txt->text.max_y)
10387 BUF_APPENDF(I6"max: %d %d;\n", txt->text.max_x, txt->text.max_y); 10387 BUF_APPENDF(I6"max: %d %d;\n", txt->text.max_x, txt->text.max_y);
10388 if (TO_DOUBLE(txt->text.align.x) != 0.5 || TO_DOUBLE(txt->text.align.y) != 0.5) 10388 if (TO_DOUBLE(txt->text.align.x) != 0.5 || TO_DOUBLE(txt->text.align.y) != 0.5)