aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2013-02-21 14:59:27 +0000
committerTom Hacohen <tom@stosb.com>2013-02-21 15:00:57 +0000
commit4fc694978b4aab0b4dae37407301793b4d296b43 (patch)
tree23776d89c92e401c51e24951ab96432c8b73e089
parentd6dababe7815c2abdc62e5cfcb498c9da045dc97 (diff)
downloadefl-4fc694978b4aab0b4dae37407301793b4d296b43.tar.gz
efl-4fc694978b4aab0b4dae37407301793b4d296b43.tar.xz
efl-4fc694978b4aab0b4dae37407301793b4d296b43.zip
Evas font: Fixed font run detection for some cases.
There were issues for specific cases with 2 different fonts in the middle of a run.
-rw-r--r--ChangeLog3
-rw-r--r--NEWS1
-rw-r--r--src/lib/evas/common/evas_font_query.c10
3 files changed, 7 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index a1ad0c58c..860053b92 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,9 @@
2013-02-21 Tom Hacohen (TAsn)
* Evas text: Fixed bug with the text object direction detection.
+ * Evas font: Fixed font run detection for specific cases with 2
+ different fonts in the middle of a run.
- size_range.
2013-02-21 Carsten Haitzler (The Rasterman)
* Add ecore_x_dnd_self_begin() and ecore_x_dnd_self_drop() to
diff --git a/NEWS b/NEWS
index a9bf4ed1d..d4f5c06d0 100644
--- a/NEWS
+++ b/NEWS
@@ -178,4 +178,5 @@ Fixes:
* Properly report file not found in Edje.
* Fix ecore-x edid fetch to ftech 128, not 100 bytes.
* Evas text: Fixed bug with the text object direction detection.
+ * Evas font: Fixed font run detection for specific cases with 2 different fonts in the middle of a run.
diff --git a/src/lib/evas/common/evas_font_query.c b/src/lib/evas/common/evas_font_query.c
index a5dcbcb84..d3f722174 100644
--- a/src/lib/evas/common/evas_font_query.c
+++ b/src/lib/evas/common/evas_font_query.c
@@ -79,12 +79,10 @@ evas_common_font_query_run_font_end_get(RGBA_Font *fn, RGBA_Font_Int **script_fi
continue;
/* Break if either it's not in the font, or if it is in the
* script's font. */
- if (fi == *script_fi)
- {
- if (!evas_common_get_char_index(fi, *itr))
- break;
- }
- else
+ if (!evas_common_get_char_index(fi, *itr))
+ break;
+
+ if (fi != *script_fi)
{
if (evas_common_get_char_index(*script_fi, *itr))
break;