evas textblock: fixed to update ascent/descent for font instance 46/142046/2
authorYoungbok Shin <youngb.shin@samsung.com>
Wed, 2 Aug 2017 09:53:20 +0000 (18:53 +0900)
committerGerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
Wed, 2 Aug 2017 09:58:11 +0000 (09:58 +0000)
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

src/lib/evas/canvas/evas_object_textblock.c

index 27e7443..69909d5 100644 (file)
@@ -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 */
 }