summaryrefslogtreecommitdiff
path: root/src/lib/edje/edje_calc.c
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/lib/edje/edje_calc.c33
1 files changed, 2 insertions, 31 deletions
diff --git a/src/lib/edje/edje_calc.c b/src/lib/edje/edje_calc.c
index 5e1ce0bcae..cadadb5f72 100644
--- a/src/lib/edje/edje_calc.c
+++ b/src/lib/edje/edje_calc.c
@@ -1003,30 +1003,6 @@ _edje_recalc_table_parts(Edje *ed
1003#endif 1003#endif
1004} 1004}
1005 1005
1006// Defined in edje_textblock.c
1007Eina_Bool
1008_edje_part_textblock_style_text_set(Edje *ed,
1009 Edje_Real_Part *ep,
1010 Edje_Part_Description_Text *chosen_desc);
1011
1012void
1013_edje_recalc_textblock_style_text_set(Edje *ed)
1014{
1015 unsigned short i;
1016 Edje_Real_Part *ep;
1017
1018 for (i = 0; i < ed->table_parts_size; i++)
1019 {
1020 ep = ed->table_parts[i];
1021
1022 if (ep->part->type == EDJE_PART_TYPE_TEXTBLOCK)
1023 {
1024 _edje_part_textblock_style_text_set
1025 (ed, ep, (Edje_Part_Description_Text *)ep->chosen_description);
1026 }
1027 }
1028}
1029
1030void 1006void
1031_edje_recalc_do(Edje *ed) 1007_edje_recalc_do(Edje *ed)
1032{ 1008{
@@ -1037,14 +1013,9 @@ _edje_recalc_do(Edje *ed)
1037#endif 1013#endif
1038 1014
1039 1015
1040 //Do nothing if the edje has no size, Regardless of the edje part size calc, 1016 //Do nothing if the edje has no size,
1041 //the text and style has to be set.
1042 if ((EINA_UNLIKELY(!ed->has_size)) && (!ed->calc_only) && (ed->w == 0) && (ed->h == 0)) 1017 if ((EINA_UNLIKELY(!ed->has_size)) && (!ed->calc_only) && (ed->w == 0) && (ed->h == 0))
1043 { 1018 return;
1044 _edje_recalc_textblock_style_text_set(ed);
1045
1046 return;
1047 }
1048 ed->has_size = EINA_TRUE; 1019 ed->has_size = EINA_TRUE;
1049 1020
1050 need_calc = evas_object_smart_need_recalculate_get(ed->obj); 1021 need_calc = evas_object_smart_need_recalculate_get(ed->obj);