From: Youngbok Shin <youngb.shin@samsung.com>
Date: Wed, 26 Jul 2017 05:01:44 +0000 (+0900)
Subject: evas textblock: support nagative value for linegap
X-Git-Tag: accepted/tizen/unified/20170728.195341~3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F81%2F140681%2F1;p=platform%2Fupstream%2Fefl.git

evas textblock: support nagative value for linegap

It was supported since Tizen 2.3.

@tizen_fix

Change-Id: I0645e5a1b03d821d965bd33d22592916abe8e04a
---

diff --git a/src/lib/evas/canvas/evas_object_textblock.c b/src/lib/evas/canvas/evas_object_textblock.c
index b2ffe75..27e7443 100644
--- a/src/lib/evas/canvas/evas_object_textblock.c
+++ b/src/lib/evas/canvas/evas_object_textblock.c
@@ -2734,8 +2734,13 @@ _layout_format_ascent_descent_adjust(const Evas_Object *eo_obj,
           }
         descent += fmt->linegap * obj->cur->scale;
         descent += ((ascent + descent) * fmt->linerelgap);
+        /* TIZEN_ONLY(20170726): Support negative values for linegap
         if (*maxascent < ascent) *maxascent = ascent;
         if (*maxdescent < descent) *maxdescent = descent;
+         */
+        *maxascent = ascent;
+        *maxdescent = descent;
+        /* END */
         if (fmt->linefill > 0.0)
           {
              int dh;
@@ -2887,10 +2892,14 @@ _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);
 
    if (asc > *ascent) *ascent = asc;
    if (desc > *descent) *descent = desc;
+    */
+   if (fmt) _layout_format_ascent_descent_adjust(eo_obj, ascent, descent, fmt);
+   /* END */
 }
 
 /**