summaryrefslogtreecommitdiff
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)
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 a1ad0c58c2..860053b926 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,9 @@
12013-02-21 Tom Hacohen (TAsn) 12013-02-21 Tom Hacohen (TAsn)
2 2
3 * Evas text: Fixed bug with the text object direction detection. 3 * Evas text: Fixed bug with the text object direction detection.
4 * Evas font: Fixed font run detection for specific cases with 2
5 different fonts in the middle of a run.
4 6
5 size_range.
62013-02-21 Carsten Haitzler (The Rasterman) 72013-02-21 Carsten Haitzler (The Rasterman)
7 8
8 * Add ecore_x_dnd_self_begin() and ecore_x_dnd_self_drop() to 9 * Add ecore_x_dnd_self_begin() and ecore_x_dnd_self_drop() to
diff --git a/NEWS b/NEWS
index a9bf4ed1d4..d4f5c06d09 100644
--- a/NEWS
+++ b/NEWS
@@ -178,4 +178,5 @@ Fixes:
178 * Properly report file not found in Edje. 178 * Properly report file not found in Edje.
179 * Fix ecore-x edid fetch to ftech 128, not 100 bytes. 179 * Fix ecore-x edid fetch to ftech 128, not 100 bytes.
180 * Evas text: Fixed bug with the text object direction detection. 180 * Evas text: Fixed bug with the text object direction detection.
181 * Evas font: Fixed font run detection for specific cases with 2 different fonts in the middle of a run.
181 182
diff --git a/src/lib/evas/common/evas_font_query.c b/src/lib/evas/common/evas_font_query.c
index a5dcbcb84b..d3f722174c 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
79 continue; 79 continue;
80 /* Break if either it's not in the font, or if it is in the 80 /* Break if either it's not in the font, or if it is in the
81 * script's font. */ 81 * script's font. */
82 if (fi == *script_fi) 82 if (!evas_common_get_char_index(fi, *itr))
83 { 83 break;
84 if (!evas_common_get_char_index(fi, *itr)) 84
85 break; 85 if (fi != *script_fi)
86 }
87 else
88 { 86 {
89 if (evas_common_get_char_index(*script_fi, *itr)) 87 if (evas_common_get_char_index(*script_fi, *itr))
90 break; 88 break;