Mirrors_UI_SDK/MiniGUI
1
0
Fork 0
mirror of https://github.com/VincentWei/MiniGUI.git synced 2026-09-26 03:23:46 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

call __mg_legacy_bidi_map_reorder when getting the visual Achars

Browse Source
This commit is contained in:
Vincent Wei
2022-11-25 11:01:36 +08:00
parent 1e006c0589
commit 272bc39c84
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/include/bidi.h
+3 -3
View File
@@ -112,11 +112,11 @@ void __mg_legacy_bidi_get_embeddlevels (const CHARSETOPS* charset_ops,
Uint32 __mg_legacy_bidi_str_base_dir (const CHARSETOPS* charset_ops,
Achar32* achars, int len);
Achar32* __mg_legacy_bidi_map_reorder (const CHARSETOPS* charset_ops,
Achar32* achars, int len, int pel, ACHARMAPINFO* map);
#if 0
// Deprecated
Achar32* __mg_legacy_bidi_map_reorder (const CHARSETOPS* charset_ops,
Achar32* achars, int len, GLYPHMAPINFO* map, int pel);
Achar32* __mg_legacy_bidi_index_reorder (const CHARSETOPS* charset_ops,
Achar32* achars, int len, int* index_map, int pel);
#endif
src/newgdi/legacy-bidi.c
+6 -6
View File
@@ -1429,6 +1429,7 @@ void GUIAPI BIDIGetTextRangesLog2Vis(LOGFONT* log_font,
free(l_achars);
}
#if 0
static void bidi_reverse_map (void* context, int len, int pos)
{
ACHARMAPINFO* str = (ACHARMAPINFO*)context + pos;
@@ -1440,6 +1441,7 @@ static void bidi_reverse_map (void* context, int len, int pos)
str[len - 1 - i] = tmp;
}
}
#endif
int GUIAPI BIDIGetTextVisualAChars(LOGFONT* log_font,
const char* text, int text_len,
@@ -1457,9 +1459,8 @@ int GUIAPI BIDIGetTextVisualAChars(LOGFONT* log_font,
if (nr_achars > 0 && mbc_devfont
&& mbc_devfont->charset_ops->bidi_char_type) {
__mg_legacy_bidi_achars_reorder (mbc_devfont->charset_ops,
*achs, nr_achars, -1,
*achs_map, bidi_reverse_map);
__mg_legacy_bidi_map_reorder (mbc_devfont->charset_ops,
*achs, nr_achars, -1, *achs_map);
}
return nr_achars;
@@ -1472,9 +1473,8 @@ Achar32* GUIAPI BIDILogAChars2VisAChars(LOGFONT* log_font,
if (nr_achars > 0 && mbc_devfont
&& mbc_devfont->charset_ops->bidi_char_type) {
__mg_legacy_bidi_achars_reorder (mbc_devfont->charset_ops,
achs, nr_achars, -1,
achs_map, bidi_reverse_map);
__mg_legacy_bidi_map_reorder (mbc_devfont->charset_ops,
achs, nr_achars, -1, achs_map);
return achs;
}