From: Youngbok Shin <youngb.shin@samsung.com>
Date: Wed, 2 Aug 2017 09:53:20 +0000 (+0900)
Subject: evas textblock: fixed to update ascent/descent for font instance
X-Git-Tag: accepted/tizen/4.0/unified/20170816.011633~3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5a9b4478ae9db88bd96e385b880fcd49558e78b7;p=platform%2Fupstream%2Fefl.git

evas textblock: fixed to update ascent/descent for font instance

There was a mistake from the following patch.
"evas textblock: fixed to calc ascent/descent values with considering main font"

@tizen_fix

Change-Id: I2c5af6002290288ff9acebe98a2a879ec6ac047f
---

diff --git a/src/lib/evas/canvas/evas_object_textblock.c b/src/lib/evas/canvas/evas_object_textblock.c
index 27e7443..69909d5 100644
--- a/src/lib/evas/canvas/evas_object_textblock.c
+++ b/src/lib/evas/canvas/evas_object_textblock.c
@@ -2894,10 +2894,13 @@ _layout_item_ascent_descent_adjust(const Evas_Object *eo_obj,
     */
    /* TIZEN_ONLY(20170726): Support negative values for linegap
    if (fmt) _layout_format_ascent_descent_adjust(eo_obj, &asc, &desc, fmt);
+    */
+   /* END */
 
    if (asc > *ascent) *ascent = asc;
    if (desc > *descent) *descent = desc;
-    */
+
+   /* TIZEN_ONLY(20170726): Support negative values for linegap */
    if (fmt) _layout_format_ascent_descent_adjust(eo_obj, ascent, descent, fmt);
    /* END */
 }