[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14753] trunk/blender/source/blender/src/ drawimasel.c: == bugfix ==

[Andrea Weikert]

Revision: 14753
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14753
Author:   elubie
Date:     2008-05-08 22:55:16 +0200 (Thu, 08 May 2008)

Log Message:
-----------
== bugfix ==
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.

Modified Paths:
--------------
    trunk/blender/source/blender/src/drawimasel.c

Modified: trunk/blender/source/blender/src/drawimasel.c
===================================================================
--- trunk/blender/source/blender/src/drawimasel.c	2008-05-08 20:51:22 UTC (rev 14752)
+++ trunk/blender/source/blender/src/drawimasel.c	2008-05-08 20:55:16 UTC (rev 14753)
@@ -308,11 +308,33 @@
 					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);