From: Jaehyun Cho <jae_hyun.cho@samsung.com>
Date: Mon, 17 Jun 2019 12:20:53 +0000 (+0900)
Subject: evas_object_text_block: fix halign_set to work
X-Git-Tag: accepted/tizen/unified/20190620.071902~24
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F40%2F208040%2F1;p=platform%2Fupstream%2Fefl.git

evas_object_text_block: fix halign_set to work

New format's halign and halign_auto were initialized with default values
after the new format copied halign and halign_auto from original format.
This caused that the halign value given by halign_set was not applied.

To keep backward compatibility and to resolve the bug, halign and
halign_auto are initialized only for legacy textblock.

Change-Id: I9639fcea898c4bea41c1eed6c91cffd7feadd695
---

diff --git a/src/lib/evas/canvas/evas_object_textblock.c b/src/lib/evas/canvas/evas_object_textblock.c
index 47a018d..5df3552 100644
--- a/src/lib/evas/canvas/evas_object_textblock.c
+++ b/src/lib/evas/canvas/evas_object_textblock.c
@@ -3643,10 +3643,21 @@ _layout_format_push(Ctxt *c, Evas_Object_Textblock_Format *fmt,
         *fmt = c->o->default_format.format;
         fmt->ref = 1;
         fmt->font.bitmap_scalable = _FMT_INFO(bitmap_scalable);
-        /* TIZEN_ONLY(20180509): Fix default values for text alignment */
-        fmt->halign = 0.0;
-        fmt->halign_auto = EINA_TRUE;
-        fmt->valign = -1.0;
+
+        /* TIZEN_ONLY(20190617): The initialized halign and halign_auto caused
+         * that the halign value given by halign_set was not applied.
+         * To keep backward compatibility and to resolve the bug, halign and
+         * halign_auto are initialized only for legacy textblock. */
+        Evas_Object_Protected_Data *obj;
+        obj = efl_data_scope_get(c->obj, EFL_CANVAS_OBJECT_CLASS);
+        if (obj->legacy.ctor)
+          {
+             /* TIZEN_ONLY(20180509): Fix default values for text alignment */
+             fmt->halign = 0.0;
+             fmt->halign_auto = EINA_TRUE;
+             fmt->valign = -1.0;
+             /* END */
+          }
         /* END */
 
         // Apply font if specified