evas textblock: fixed to calc ascent/descent values with considering main font

@tizen_fix

Change-Id: I9b87d046737e78ef55ba00e58d808db979e1805e

diff --git a/src/lib/evas/canvas/evas_object_textblock.c b/src/lib/evas/canvas/evas_object_textblock.c
index 470b332..b2ffe75 100644 (file)
--- a/src/lib/evas/canvas/evas_object_textblock.c
+++ b/src/lib/evas/canvas/evas_object_textblock.c
@@ -2770,11 +2770,17 @@ _layout_item_max_ascent_descent_calc(const Evas_Object *eo_obj,
          (position == TEXTBLOCK_POSITION_SINGLE))
      {
         Evas_Coord asc = 0;
+        /* TIZEN_ONLY(20170721): fixed to calc ascent/descent values with considering main font */
+        Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
+
+        *maxascent = ENFN->font_max_ascent_get(ENDT, it->format->font.font);
+        /* END */
 
         if (fi)
           {
              asc = evas_common_font_instance_max_ascent_get(fi);
           }
+        /* TIZEN_ONLY(20170721): fixed to calc ascent/descent values with considering main font
         else
           {
              Evas_Object_Protected_Data *obj =
@@ -2782,6 +2788,7 @@ _layout_item_max_ascent_descent_calc(const Evas_Object *eo_obj,
              asc = ENFN->font_max_ascent_get(ENDT,
                    it->format->font.font);
           }
+         */
 
         if (asc > *maxascent)
            *maxascent = asc;
@@ -2792,11 +2799,17 @@ _layout_item_max_ascent_descent_calc(const Evas_Object *eo_obj,
      {
         /* Calculate max descent. */
         Evas_Coord desc = 0;
+        /* TIZEN_ONLY(20170721): fixed to calc ascent/descent values with considering main font */
+        Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
+
+        *maxdescent = ENFN->font_max_descent_get(ENDT, it->format->font.font);
+        /* END */
 
         if (fi)
           {
              desc = evas_common_font_instance_max_descent_get(fi);
           }
+        /* TIZEN_ONLY(20170721): fixed to calc ascent/descent values with considering main font
         else
           {
              Evas_Object_Protected_Data *obj =
@@ -2804,6 +2817,7 @@ _layout_item_max_ascent_descent_calc(const Evas_Object *eo_obj,
              desc = ENFN->font_max_descent_get(ENDT,
                    it->format->font.font);
           }
+         */
 
         if (desc > *maxdescent)
            *maxdescent = desc;
@@ -2843,11 +2857,25 @@ _layout_item_ascent_descent_adjust(const Evas_Object *eo_obj,
           }
      }
 
+   /* TIZEN_ONLY(20170721): fixed to calc ascent/descent values with considering main font */
+   if (fmt)
+     {
+        Evas_Object_Protected_Data *obj =
+           eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
+        asc = ENFN->font_ascent_get(ENDT, fmt->font.font);
+        desc = ENFN->font_descent_get(ENDT, fmt->font.font);
+
+        if (asc > *ascent) *ascent = asc;
+        if (desc > *descent) *descent = desc;
+     }
+   /* END */
+
    if (fi)
      {
         asc = evas_common_font_instance_ascent_get(fi);
         desc = evas_common_font_instance_descent_get(fi);
      }
+   /* TIZEN_ONLY(20170721): fixed to calc ascent/descent values with considering main font
    else
      {
         if (fmt)
@@ -2858,6 +2886,7 @@ _layout_item_ascent_descent_adjust(const Evas_Object *eo_obj,
              desc = ENFN->font_descent_get(ENDT, fmt->font.font);
           }
      }
+    */
    if (fmt) _layout_format_ascent_descent_adjust(eo_obj, &asc, &desc, fmt);
 
    if (asc > *ascent) *ascent = asc;