From 5a9b4478ae9db88bd96e385b880fcd49558e78b7 Mon Sep 17 00:00:00 2001 From: Youngbok Shin Date: Wed, 2 Aug 2017 18:53:20 +0900 Subject: [PATCH] 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 --- src/lib/evas/canvas/evas_object_textblock.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 */ } -- 2.7.4