aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/edje/edje_calc.c
diff options
context:
space:
mode:
authorThiep Ha <thiepha@gmail.com>2017-10-18 10:51:49 +0900
committerThiep Ha <thiepha@gmail.com>2017-10-18 10:51:49 +0900
commit6597b89f53abf99719cbc2bc06d9daa61b08ca94 (patch)
tree525757b77083887a6afec1f7aa3dccf595560442 /src/lib/edje/edje_calc.c
parenttextpath: get the right size of text object (diff)
downloadefl-6597b89f53abf99719cbc2bc06d9daa61b08ca94.tar.gz
edje: correct the usage of EINA_SIZE2D
The usage of EINA_SIZE2D macro as left hand side variable does not save the size value. The Eina_Size2D should be used.
Diffstat (limited to '')
-rw-r--r--src/lib/edje/edje_calc.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/edje/edje_calc.c b/src/lib/edje/edje_calc.c
index fc71bad49a..5a01da863f 100644
--- a/src/lib/edje/edje_calc.c
+++ b/src/lib/edje/edje_calc.c
@@ -2116,7 +2116,7 @@ _edje_part_recalc_single_text(FLOAT_T sc EINA_UNUSED,
{
const char *text;
const char *font;
- Evas_Coord tw, th;
+ Eina_Size2D ts;
int inlined_font = 0;
Edje_Real_Part *source, *text_source;
@@ -2247,33 +2247,33 @@ _edje_part_recalc_single_text(FLOAT_T sc EINA_UNUSED,
evas_obj_text_style_set(ep->object, style);
evas_obj_text_set(ep->object, text);
- EINA_SIZE2D(tw, th) = efl_gfx_size_get(ep->object);
+ ts = efl_gfx_size_get(ep->object);
if (chosen_desc->text.max_x)
{
int l, r;
evas_object_text_style_pad_get(ep->object, &l, &r, NULL, NULL);
- mw = tw + l + r;
+ mw = ts.w + l + r;
if ((*maxw < 0) || (mw < *maxw)) *maxw = mw;
}
if (chosen_desc->text.max_y)
{
int t, b;
evas_object_text_style_pad_get(ep->object, NULL, NULL, &t, &b);
- mh = th + t + b;
+ mh = ts.h + t + b;
if ((*maxh < 0) || (mh < *maxh)) *maxh = mh;
}
if (chosen_desc->text.min_x)
{
int l, r;
evas_object_text_style_pad_get(ep->object, &l, &r, NULL, NULL);
- mw = tw + l + r;
+ mw = ts.w + l + r;
if (mw > *minw) *minw = mw;
}
if (chosen_desc->text.min_y)
{
int t, b;
evas_object_text_style_pad_get(ep->object, NULL, NULL, &t, &b);
- mh = th + t + b;
+ mh = ts.h + t + b;
if (mh > *minh) *minh = mh;
}
}