summaryrefslogtreecommitdiff
path: root/src/lib/evas/canvas/evas_object_textblock.c
diff options
context:
space:
mode:
authorJaehyun Cho <jae_hyun.cho@samsung.com>2019-05-15 21:53:02 +0900
committerJaehyun Cho <jae_hyun.cho@samsung.com>2019-05-16 13:30:54 +0900
commit6da6bd536e1386488d3e2e746659f113226a3e02 (patch)
treeebb45d7f3b9ecf3d043aa02ddad398a47bb2ba56 /src/lib/evas/canvas/evas_object_textblock.c
parent122ca2fa2f9290729e10715253e45f0ad343e09a (diff)
efl_canvas_text: fix to set halign correctly
Previously, halign_auto was AUTO_NORMAL when halign was set so the given halign value could not be applied correctly. Now, halign_auto is modified to AUTO_NONE before halign is set so the given halign value is applied correctly.
Diffstat (limited to 'src/lib/evas/canvas/evas_object_textblock.c')
-rw-r--r--src/lib/evas/canvas/evas_object_textblock.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/lib/evas/canvas/evas_object_textblock.c b/src/lib/evas/canvas/evas_object_textblock.c
index bb8deab..c0948b1 100644
--- a/src/lib/evas/canvas/evas_object_textblock.c
+++ b/src/lib/evas/canvas/evas_object_textblock.c
@@ -15995,11 +15995,6 @@ _efl_canvas_text_efl_text_font_font_bitmap_scalable_get(const Eo *obj EINA_UNUSE
15995 _FMT(x) = v; \ 15995 _FMT(x) = v; \
15996 _canvas_text_format_changed(obj, o); 15996 _canvas_text_format_changed(obj, o);
15997 15997
15998#define _FMT_DBL_SET(x, v) \
15999 if (EINA_DBL_EQ(_FMT(x), v)) return; \
16000 _FMT(x) = v; \
16001 _canvas_text_format_changed(obj, o);
16002
16003/* Helper: updates format field of extended format information, and informs if changed. */ 15998/* Helper: updates format field of extended format information, and informs if changed. */
16004#define _FMT_INFO_SET_START(x, v) \ 15999#define _FMT_INFO_SET_START(x, v) \
16005 Eina_Bool changed = EINA_FALSE; \ 16000 Eina_Bool changed = EINA_FALSE; \
@@ -16453,8 +16448,9 @@ _efl_canvas_text_efl_text_format_halign_set(Eo *obj, Efl_Canvas_Text_Data *o,
16453 double value) 16448 double value)
16454{ 16449{
16455 ASYNC_BLOCK; 16450 ASYNC_BLOCK;
16456 _FMT_DBL_SET(halign, value); 16451 if (EINA_DBL_EQ(_FMT(halign), value)) return;
16457 _FMT(halign_auto) = EVAS_TEXTBLOCK_ALIGN_AUTO_NONE; 16452 _FMT(halign_auto) = EVAS_TEXTBLOCK_ALIGN_AUTO_NONE;
16453 _FMT_SET(halign, value);
16458} 16454}
16459 16455
16460static double 16456static double