zmike pushed a commit to branch efl-1.22.
http://git.enlightenment.org/core/efl.git/commit/?id=eaab63ff0c01c37ce2e0009c2d0e8fcba0879913
commit eaab63ff0c01c37ce2e0009c2d0e8fcba0879913
Author: Jaehyun Cho <jae_hyun....@samsung.com>
Date: Wed May 15 21:53:02 2019 +0900
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.
---
src/lib/evas/canvas/evas_object_textblock.c | 8 ++------
1 file 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
--
