Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix drawing of translated strings (can't use _ascii version of BLF_draw in these cases, when WITH_INTERNATIONAL is defined we need unicode support).

Browse Source
This commit is contained in:
Bastien Montagne
2013-02-20 08:39:31 +00:00
parent 7f8d597c79
commit 5d04d06d76
2 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
source/blender/editors/space_view3d/view3d_draw.c
View File

@@ -854,8 +854,13 @@ static void draw_viewport_name(ARegion *ar, View3D *v3d, rcti *rect)
{ {
RegionView3D *rv3d = ar->regiondata; RegionView3D *rv3d = ar->regiondata;
const char *name = view3d_get_name(v3d, rv3d); const char *name = view3d_get_name(v3d, rv3d);
/* XXX 24 may be a bit small for unicode languages (Chinese in utf-8...) */
#ifdef WITH_INTERNATIONAL
char tmpstr[32];
#else
char tmpstr[24]; char tmpstr[24];
#endif
if (v3d->localvd) { if (v3d->localvd) {
BLI_snprintf(tmpstr, sizeof(tmpstr), IFACE_("%s (Local)"), name); BLI_snprintf(tmpstr, sizeof(tmpstr), IFACE_("%s (Local)"), name);
name = tmpstr; name = tmpstr;
@@ -863,7 +868,11 @@ static void draw_viewport_name(ARegion *ar, View3D *v3d, rcti *rect)
if (name) { if (name) {
UI_ThemeColor(TH_TEXT_HI); UI_ThemeColor(TH_TEXT_HI);
#ifdef WITH_INTERNATIONAL
BLF_draw_default(U.widget_unit + rect->xmin, rect->ymax - U.widget_unit, 0.0f, name, sizeof(tmpstr));
#else
BLF_draw_default_ascii(U.widget_unit + rect->xmin, rect->ymax - U.widget_unit, 0.0f, name, sizeof(tmpstr)); BLF_draw_default_ascii(U.widget_unit + rect->xmin, rect->ymax - U.widget_unit, 0.0f, name, sizeof(tmpstr));
#endif
} }
} }
@@ -2854,8 +2863,12 @@ static void draw_viewport_fps(Scene *scene, rcti *rect)
UI_ThemeColor(TH_TEXT_HI); UI_ThemeColor(TH_TEXT_HI);
BLI_snprintf(printable, sizeof(printable), IFACE_("fps: %i"), (int)(fps + 0.5f)); BLI_snprintf(printable, sizeof(printable), IFACE_("fps: %i"), (int)(fps + 0.5f));
} }
#ifdef WITH_INTERNATIONAL
BLF_draw_default(rect->xmin + U.widget_unit, rect->ymax - U.widget_unit, 0.0f, printable, sizeof(printable));
#else
BLF_draw_default_ascii(rect->xmin + U.widget_unit, rect->ymax - U.widget_unit, 0.0f, printable, sizeof(printable)); BLF_draw_default_ascii(rect->xmin + U.widget_unit, rect->ymax - U.widget_unit, 0.0f, printable, sizeof(printable));
#endif
} }
static void view3d_main_area_draw_objects(const bContext *C, ARegion *ar, const char **grid_unit); static void view3d_main_area_draw_objects(const bContext *C, ARegion *ar, const char **grid_unit);

4
source/blender/editors/transform/transform.c
View File

@@ -1686,7 +1686,11 @@ static void drawAutoKeyWarning(TransInfo *UNUSED(t), ARegion *ar)
* - original color was red to match the icon, but that clashes badly with a less nasty border * - original color was red to match the icon, but that clashes badly with a less nasty border
*/ */
UI_ThemeColorShade(TH_TEXT_HI, -50); UI_ThemeColorShade(TH_TEXT_HI, -50);
#ifdef WITH_INTERNATIONAL
BLF_draw_default(xco, ar->winy - 17, 0.0f, printable, sizeof(printable));
#else
BLF_draw_default_ascii(xco, ar->winy - 17, 0.0f, printable, sizeof(printable)); BLF_draw_default_ascii(xco, ar->winy - 17, 0.0f, printable, sizeof(printable));
#endif
/* autokey recording icon... */ /* autokey recording icon... */
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);