summaryrefslogtreecommitdiff
path: root/src/lib/evas/common/evas_font_main.c
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2013-06-10 14:51:38 +0100
committerTom Hacohen <tom@stosb.com>2013-06-10 14:51:38 +0100
commitd7db12f196611acbcf5bbb923fed10621b68b1b8 (patch)
treeae9665c8236bdf5579ead3129a566b2ec4358611 /src/lib/evas/common/evas_font_main.c
parente0372fc54d2ac656baabcc4250ba670f9ac95862 (diff)
Revert "fix slowdown as a result of fixing text ascent/descent for fontsets from tom."
This reverts commit 9ecc87713d5cc936c81d10230bd25bb94e42833a.
Diffstat (limited to '')
-rw-r--r--src/lib/evas/common/evas_font_main.c12
1 files changed, 0 insertions, 12 deletions
diff --git a/src/lib/evas/common/evas_font_main.c b/src/lib/evas/common/evas_font_main.c
index 1de4a56ee4..76247cd2be 100644
--- a/src/lib/evas/common/evas_font_main.c
+++ b/src/lib/evas/common/evas_font_main.c
@@ -185,14 +185,11 @@ evas_common_font_ascent_get(RGBA_Font *fn)
185 Eina_List *l; 185 Eina_List *l;
186 RGBA_Font_Int *fi; 186 RGBA_Font_Int *fi;
187 187
188 if (fn->have_ascent) return fn->ascent;
189 EINA_LIST_FOREACH(fn->fonts, l, fi) 188 EINA_LIST_FOREACH(fn->fonts, l, fi)
190 { 189 {
191 v = evas_common_font_instance_ascent_get(fi); 190 v = evas_common_font_instance_ascent_get(fi);
192 if (v > max) max = v; 191 if (v > max) max = v;
193 } 192 }
194 fn->ascent = max;
195 fn->have_ascent = 1;
196 return max; 193 return max;
197} 194}
198 195
@@ -204,14 +201,11 @@ evas_common_font_descent_get(RGBA_Font *fn)
204 Eina_List *l; 201 Eina_List *l;
205 RGBA_Font_Int *fi; 202 RGBA_Font_Int *fi;
206 203
207 if (fn->have_descent) return fn->descent;
208 EINA_LIST_FOREACH(fn->fonts, l, fi) 204 EINA_LIST_FOREACH(fn->fonts, l, fi)
209 { 205 {
210 v = evas_common_font_instance_descent_get(fi); 206 v = evas_common_font_instance_descent_get(fi);
211 if (v > max) max = v; 207 if (v > max) max = v;
212 } 208 }
213 fn->descent = max;
214 fn->have_descent = 1;
215 return max; 209 return max;
216} 210}
217 211
@@ -223,14 +217,11 @@ evas_common_font_max_ascent_get(RGBA_Font *fn)
223 Eina_List *l; 217 Eina_List *l;
224 RGBA_Font_Int *fi; 218 RGBA_Font_Int *fi;
225 219
226 if (fn->have_max_ascent) return fn->max_ascent;
227 EINA_LIST_FOREACH(fn->fonts, l, fi) 220 EINA_LIST_FOREACH(fn->fonts, l, fi)
228 { 221 {
229 v = evas_common_font_instance_max_ascent_get(fi); 222 v = evas_common_font_instance_max_ascent_get(fi);
230 if (v > max) max = v; 223 if (v > max) max = v;
231 } 224 }
232 fn->max_ascent = max;
233 fn->have_max_ascent = 1;
234 return max; 225 return max;
235} 226}
236 227
@@ -242,14 +233,11 @@ evas_common_font_max_descent_get(RGBA_Font *fn)
242 Eina_List *l; 233 Eina_List *l;
243 RGBA_Font_Int *fi; 234 RGBA_Font_Int *fi;
244 235
245 if (fn->have_max_descent) return fn->max_descent;
246 EINA_LIST_FOREACH(fn->fonts, l, fi) 236 EINA_LIST_FOREACH(fn->fonts, l, fi)
247 { 237 {
248 v = evas_common_font_instance_max_descent_get(fi); 238 v = evas_common_font_instance_max_descent_get(fi);
249 if (v > max) max = v; 239 if (v > max) max = v;
250 } 240 }
251 fn->max_descent = max;
252 fn->have_max_descent = 1;
253 return max; 241 return max;
254} 242}
255 243