summaryrefslogtreecommitdiff
path: root/src/lib/edje/edje_text.c
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@samsung.com>2014-04-22 15:21:50 -0400
committerMike Blumenkrantz <zmike@samsung.com>2014-04-25 10:52:15 -0400
commite6f0deca271ecaaeca41f383a71d8ac5bbcca6bf (patch)
treebec915e4cac127730021aa4d99f122dbbe8e709f /src/lib/edje/edje_text.c
parent5f376fde368d3ea2b429790c31a753ccad00317d (diff)
edje should only apply "calculated" text size if that size exists
fixes text.source sizing when size is not specified in child part
Diffstat (limited to 'src/lib/edje/edje_text.c')
-rw-r--r--src/lib/edje/edje_text.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/edje/edje_text.c b/src/lib/edje/edje_text.c
index 4add65f..ee35101 100644
--- a/src/lib/edje/edje_text.c
+++ b/src/lib/edje/edje_text.c
@@ -255,7 +255,8 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
255 sh = TO_INT(params->eval.h); 255 sh = TO_INT(params->eval.h);
256 } 256 }
257 257
258 size = params->type.text.size; 258 if (params->type.text.size)
259 size = params->type.text.size;
259 if (!text) text = ""; 260 if (!text) text = "";
260 261
261 if ((text == ep->typedata.text->cache.in_str) 262 if ((text == ep->typedata.text->cache.in_str)