diff options
| author | Jaehyun Cho <jae_hyun.cho@samsung.com> | 2019-05-15 21:53:02 +0900 |
|---|---|---|
| committer | Jaehyun Cho <jae_hyun.cho@samsung.com> | 2019-05-16 13:30:54 +0900 |
| commit | 6da6bd536e1386488d3e2e746659f113226a3e02 (patch) | |
| tree | ebb45d7f3b9ecf3d043aa02ddad398a47bb2ba56 | |
| parent | 122ca2fa2f9290729e10715253e45f0ad343e09a (diff) | |
| download | efl-6da6bd536e1386488d3e2e746659f113226a3e02.tar.gz | |
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.
| -rw-r--r-- | src/lib/evas/canvas/evas_object_textblock.c | 8 |
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 bb8deab1ce..c0948b1756 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 _FMT(x) = v; \ _canvas_text_format_changed(obj, o); -#define _FMT_DBL_SET(x, v) \ - if (EINA_DBL_EQ(_FMT(x), v)) return; \ - _FMT(x) = v; \ - _canvas_text_format_changed(obj, o); - /* Helper: updates format field of extended format information, and informs if changed. */ #define _FMT_INFO_SET_START(x, v) \ Eina_Bool changed = EINA_FALSE; \ @@ -16453,8 +16448,9 @@ _efl_canvas_text_efl_text_format_halign_set(Eo *obj, Efl_Canvas_Text_Data *o, double value) { ASYNC_BLOCK; - _FMT_DBL_SET(halign, value); + if (EINA_DBL_EQ(_FMT(halign), value)) return; _FMT(halign_auto) = EVAS_TEXTBLOCK_ALIGN_AUTO_NONE; + _FMT_SET(halign, value); } static double |