Revert "evas textblock: support nagative value for linegap" 04/161604/1
authorYoungbok Shin <youngb.shin@samsung.com>
Fri, 24 Nov 2017 09:47:38 +0000 (18:47 +0900)
committerYoungbok Shin <youngb.shin@samsung.com>
Fri, 24 Nov 2017 09:50:04 +0000 (18:50 +0900)
This reverts commit 9a48ba84f3cf09e30202de98ffff5785c9741ce6.

Change-Id: I2ae99fde1f79639095de176dd8488e8fb22290eb

src/lib/evas/canvas/evas_object_textblock.c

index bf28909..f7ac0eb 100644 (file)
@@ -2738,13 +2738,8 @@ _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;
@@ -2896,14 +2891,10 @@ _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 */
 }
 
 /**