diff options
| author | Kateryna Fesyna <k.fesyna@samsung.com> | 2014-11-14 06:58:19 +0100 |
|---|---|---|
| committer | Cedric BAIL <cedric@osg.samsung.com> | 2014-11-14 06:58:25 +0100 |
| commit | 35ac38e880f2bdb180d260c9e35037883b97ec1c (patch) | |
| tree | 551d95a1ac959d7691c202bf15c14f3f96d415c7 | |
| parent | f5d5071210a7b3d59391fabca767050041461b9b (diff) | |
| download | efl-35ac38e880f2bdb180d260c9e35037883b97ec1c.tar.gz | |
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.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/edje/edje_edit.c b/src/lib/edje/edje_edit.c index fc434eddc0..987266393f 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 BUF_APPENDF(I5"min: %d %d;\n", pd->min.w, pd->min.h); if (pd->max.w != -1 || pd->max.h != -1) BUF_APPENDF(I5"max: %d %d;\n", pd->max.w, pd->max.h); - if (pd->minmul.w != 0 || pd->minmul.h != 0) + if ((pd->minmul.have) && (pd->minmul.w != 1 || pd->minmul.h != 1)) BUF_APPENDF(I5"minmul: %g %g;\n", TO_DOUBLE(pd->minmul.w), TO_DOUBLE(pd->minmul.h)); 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 if (txt->text.fit_x || txt->text.fit_y) BUF_APPENDF(I6"fit: %d %d;\n", txt->text.fit_x, txt->text.fit_y); if (txt->text.min_x || txt->text.min_y) - BUF_APPENDF(I6"min: \"%d\" \"%d\";\n", txt->text.min_x, txt->text.min_y); + BUF_APPENDF(I6"min: %d %d;\n", txt->text.min_x, txt->text.min_y); if (txt->text.max_x || txt->text.max_y) BUF_APPENDF(I6"max: %d %d;\n", txt->text.max_x, txt->text.max_y); if (TO_DOUBLE(txt->text.align.x) != 0.5 || TO_DOUBLE(txt->text.align.y) != 0.5) |