forked from enlightenment/efl
Revert "fix slowdown as a result of fixing text ascent/descent for fontsets from tom."
This reverts commit 9ecc87713d
.
This commit is contained in:
parent
e0372fc54d
commit
d7db12f196
|
@ -185,14 +185,11 @@ evas_common_font_ascent_get(RGBA_Font *fn)
|
|||
Eina_List *l;
|
||||
RGBA_Font_Int *fi;
|
||||
|
||||
if (fn->have_ascent) return fn->ascent;
|
||||
EINA_LIST_FOREACH(fn->fonts, l, fi)
|
||||
{
|
||||
v = evas_common_font_instance_ascent_get(fi);
|
||||
if (v > max) max = v;
|
||||
}
|
||||
fn->ascent = max;
|
||||
fn->have_ascent = 1;
|
||||
return max;
|
||||
}
|
||||
|
||||
|
@ -204,14 +201,11 @@ evas_common_font_descent_get(RGBA_Font *fn)
|
|||
Eina_List *l;
|
||||
RGBA_Font_Int *fi;
|
||||
|
||||
if (fn->have_descent) return fn->descent;
|
||||
EINA_LIST_FOREACH(fn->fonts, l, fi)
|
||||
{
|
||||
v = evas_common_font_instance_descent_get(fi);
|
||||
if (v > max) max = v;
|
||||
}
|
||||
fn->descent = max;
|
||||
fn->have_descent = 1;
|
||||
return max;
|
||||
}
|
||||
|
||||
|
@ -223,14 +217,11 @@ evas_common_font_max_ascent_get(RGBA_Font *fn)
|
|||
Eina_List *l;
|
||||
RGBA_Font_Int *fi;
|
||||
|
||||
if (fn->have_max_ascent) return fn->max_ascent;
|
||||
EINA_LIST_FOREACH(fn->fonts, l, fi)
|
||||
{
|
||||
v = evas_common_font_instance_max_ascent_get(fi);
|
||||
if (v > max) max = v;
|
||||
}
|
||||
fn->max_ascent = max;
|
||||
fn->have_max_ascent = 1;
|
||||
return max;
|
||||
}
|
||||
|
||||
|
@ -242,14 +233,11 @@ evas_common_font_max_descent_get(RGBA_Font *fn)
|
|||
Eina_List *l;
|
||||
RGBA_Font_Int *fi;
|
||||
|
||||
if (fn->have_max_descent) return fn->max_descent;
|
||||
EINA_LIST_FOREACH(fn->fonts, l, fi)
|
||||
{
|
||||
v = evas_common_font_instance_max_descent_get(fi);
|
||||
if (v > max) max = v;
|
||||
}
|
||||
fn->max_descent = max;
|
||||
fn->have_max_descent = 1;
|
||||
return max;
|
||||
}
|
||||
|
||||
|
|
|
@ -894,13 +894,8 @@ struct _RGBA_Font
|
|||
Fash_Int *fash;
|
||||
Font_Hint_Flags hinting;
|
||||
int references;
|
||||
short ascent, descent, max_ascent, max_descent;
|
||||
LK(lock);
|
||||
unsigned char sizeok : 1;
|
||||
unsigned char have_ascent : 1;
|
||||
unsigned char have_descent : 1;
|
||||
unsigned char have_max_ascent : 1;
|
||||
unsigned char have_max_descent : 1;
|
||||
};
|
||||
|
||||
#include "../common/evas_font_ot.h"
|
||||
|
|
Loading…
Reference in New Issue