From: WooHyun Jung Date: Mon, 25 Nov 2019 03:03:21 +0000 (+0900) Subject: textblock: fixes build error X-Git-Tag: accepted/tizen/unified/20191125.223325~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F06%2F218506%2F2;p=platform%2Fupstream%2Fefl.git textblock: fixes build error This patch fixes build errors came from below Cursor patch. ccc44f88265868e892444ccd88a037cc57fd9c47 Change-Id: I3a504b600c3aaf38fb9214d4d9a366bdd4540447 --- diff --git a/src/lib/edje/edje_textblock.c b/src/lib/edje/edje_textblock.c index baa2d9a..834d0da 100644 --- a/src/lib/edje/edje_textblock.c +++ b/src/lib/edje/edje_textblock.c @@ -210,13 +210,17 @@ _edje_part_recalc_single_textblock_min_max_calc(Edje_Real_Part *ep, { if (temp_w > 0) { - efl_canvas_text_size_formatted_get(ep->object, &tw, &th); + size = efl_canvas_text_size_formatted_get(ep->object); + tw = size.w; + th = size.h; + tw += ins_l + ins_r; th += ins_t + ins_b; } else { - efl_canvas_text_size_native_get(ep->object, NULL, &th); + size = efl_canvas_text_size_native_get(ep->object); + th = size.h; th += ins_t + ins_b; } @@ -250,14 +254,17 @@ _edje_part_recalc_single_textblock_min_max_calc(Edje_Real_Part *ep, if (temp_w > 0) { efl_gfx_entity_size_set(ep->object, EINA_SIZE2D(temp_w, temp_h)); - efl_canvas_text_size_formatted_get(ep->object, &tw, &th); + size = efl_canvas_text_size_formatted_get(ep->object); + tw = size.w; + th = size.h; tw += ins_l + ins_r; th += ins_t + ins_b; } else { - efl_canvas_text_size_native_get(ep->object, NULL, &th); + size = efl_canvas_text_size_native_get(ep->object); + th = size.h; th += ins_t + ins_b; } @@ -698,6 +705,7 @@ _edje_part_recalc_single_textblock(FLOAT_T sc, double fit_x_scale; double fit_y_scale; int given_w, given_h; + Evas_Coord tw, th; given_w = TO_INT(params->eval.w); given_h = TO_INT(params->eval.h); @@ -719,7 +727,8 @@ _edje_part_recalc_single_textblock(FLOAT_T sc, if (chosen_desc->text.fit_x) { - efl_canvas_text_size_native_get(ep->object, &tw, NULL); + size = efl_canvas_text_size_native_get(ep->object); + tw = size.w; if (tw > 0) { fit_x_scale = _edje_part_recalc_single_textblock_scale_range_adjust(chosen_desc, orig_scale, @@ -731,7 +740,8 @@ _edje_part_recalc_single_textblock(FLOAT_T sc, if (chosen_desc->text.fit_y) { - efl_canvas_text_size_formatted_get(ep->object, NULL, &th); + size = efl_canvas_text_size_formatted_get(ep->object); + th = size.h; if (th > 0) { double given_size = (double)given_w * (double)given_w + (double)given_h * (double)given_h; @@ -748,8 +758,10 @@ _edje_part_recalc_single_textblock(FLOAT_T sc, } efl_gfx_entity_scale_set(ep->object, result_scale); - efl_canvas_text_size_native_get(ep->object, &tw, NULL); - efl_canvas_text_size_formatted_get(ep->object, NULL, &th); + size = efl_canvas_text_size_native_get(ep->object); + tw = size.w; + size = efl_canvas_text_size_formatted_get(ep->object); + th = size.h; /* Final tuning, try going down/up by 5% at a time, hoping it'll * actually end up being correct. */ @@ -770,8 +782,10 @@ _edje_part_recalc_single_textblock(FLOAT_T sc, result_scale = tmp_s; efl_gfx_entity_scale_set(ep->object, result_scale); - efl_canvas_text_size_native_get(ep->object, &tw, NULL); - efl_canvas_text_size_formatted_get(ep->object, NULL, &th); + size = efl_canvas_text_size_native_get(ep->object); + tw = size.w; + size = efl_canvas_text_size_formatted_get(ep->object); + th = size.h; i--; } } @@ -791,8 +805,10 @@ _edje_part_recalc_single_textblock(FLOAT_T sc, break; efl_gfx_entity_scale_set(ep->object, tmp_s); - efl_canvas_text_size_native_get(ep->object, &tw, NULL); - efl_canvas_text_size_formatted_get(ep->object, NULL, &th); + size = efl_canvas_text_size_native_get(ep->object); + tw = size.w; + size = efl_canvas_text_size_formatted_get(ep->object); + th = size.h; /* It can't be bigger than given size. * Restore scale for the object. */ diff --git a/src/lib/evas/canvas/evas_object_textblock.c b/src/lib/evas/canvas/evas_object_textblock.c index 206cfbb..c85aa21 100644 --- a/src/lib/evas/canvas/evas_object_textblock.c +++ b/src/lib/evas/canvas/evas_object_textblock.c @@ -11979,6 +11979,7 @@ next: static char * _evas_textblock_cursor_range_text_markup_get(const Efl_Text_Cursor_Handle *cur1, const Efl_Text_Cursor_Handle *_cur2) */ +static char * _evas_textblock_cursor_range_text_markup_get(const Efl_Text_Cursor_Handle *cur1, const Efl_Text_Cursor_Handle *_cur2, Eina_Bool valid_markup) { Evas_Object_Textblock_Node_Text *tnode;