summaryrefslogtreecommitdiff
path: root/legacy/edje/src/lib/edje_text.c
diff options
context:
space:
mode:
Diffstat (limited to 'legacy/edje/src/lib/edje_text.c')
-rw-r--r--legacy/edje/src/lib/edje_text.c12
1 files changed, 10 insertions, 2 deletions
diff --git a/legacy/edje/src/lib/edje_text.c b/legacy/edje/src/lib/edje_text.c
index 655288f..ba9ecb8 100644
--- a/legacy/edje/src/lib/edje_text.c
+++ b/legacy/edje/src/lib/edje_text.c
@@ -539,9 +539,17 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
539 size = current - 1; 539 size = current - 1;
540 } 540 }
541 } 541 }
542 if (size < 1) size = 1;
543 542
544 if (!chosen_desc->text.fit_x) 543 /* Make sure the size is in range */
544 if (size < 1)
545 size = 1;
546 else if ((size > chosen_desc->text.size_range_max) &&
547 (chosen_desc->text.size_range_max > 0))
548 size = chosen_desc->text.size_range_max;
549 else if (size < chosen_desc->text.size_range_min)
550 size = chosen_desc->text.size_range_min;
551
552 /* Handle ellipsis */
545 { 553 {
546 if (inlined_font) evas_object_text_font_source_set(ep->object, ed->path); 554 if (inlined_font) evas_object_text_font_source_set(ep->object, ed->path);
547 else evas_object_text_font_source_set(ep->object, NULL); 555 else evas_object_text_font_source_set(ep->object, NULL);