griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

== bugfix ==

Browse Source 
fix for [#10284] Activate International font hiding text in bookmark window in image browser
- use same font handling for bookmarks as for the regular files.
This commit is contained in:
Andrea Weikert
2008-05-08 20:55:16 +00:00
parent 71fbf87304
commit 7be03f2ae5
1 changed files with 24 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
source/blender/src/drawimasel.c
View File

@@ -308,11 +308,33 @@ static void draw_imasel_bookmarks(ScrArea *sa, SpaceImaSel *simasel)
BIF_ThemeColor(TH_TEXT);
}
ui_rasterpos_safe(sx, sy, simasel->aspect);
/* handling of international fonts.
TODO: proper support for utf8 in languages different from ja_JP abd zh_CH
needs update of iconv in lib/windows to support getting the system language string
*/
#ifdef WITH_ICONV
{
struct LANGMenuEntry *lme;
lme = find_language(U.language);
if ((lme !=NULL) && (!strcmp(lme->code, "ja_JP") ||
!strcmp(lme->code, "zh_CN")))
{
BIF_RasterPos(sx, sy);
#ifdef WIN32
BIF_DrawString(simasel->curfont, sname, ((U.transopts & USER_TR_MENUS) | CONVERT_TO_UTF8));
BIF_DrawString(simasel->curfont, sname, ((U.transopts & USER_TR_MENUS) | CONVERT_TO_UTF8));
#else
BIF_DrawString(simasel->curfont, sname, (U.transopts & USER_TR_MENUS));
BIF_DrawString(simasel->curfont, sname, (U.transopts & USER_TR_MENUS));
#endif
} else {
BMF_DrawString(simasel->curfont, sname);
}
}
#else
BMF_DrawString(simasel->curfont, sname);
#endif /* WITH_ICONV */
sy -= linestep;
} else {
cpack(0xB0B0B0);