archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

minor changes to BLF api use

Browse Source 
- replace calls to BLF_width & BLF_height --> BLF_width_and_height
- no need to call strlen() on length value passed to BLF_draw(). this already checks for \0 char.
This commit is contained in:
Campbell Barton
2012-01-11 05:45:39 +00:00
parent f1c229e8b3
commit cda5d1769d
5 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/editors/interface/interface_widgets.c
View File

@@ -3264,7 +3264,7 @@ void ui_draw_menu_item(uiFontStyle *fstyle, rcti *rect, const char *name, int ic
void ui_draw_preview_item(uiFontStyle *fstyle, rcti *rect, const char *name, int iconid, int state)
{
rcti trect = *rect;
float font_dims[2] = {0.0f, 0.0f};
uiWidgetType *wt= widget_type(UI_WTYPE_MENU_ITEM);
wt->state(wt, state);
@@ -3276,10 +3276,12 @@ void ui_draw_preview_item(uiFontStyle *fstyle, rcti *rect, const char *name, int
glColor3ubv((unsigned char*)wt->wcol.text);
else
glColor3ubv((unsigned char*)wt->wcol.text_sel);
BLF_width_and_height(fstyle->uifont_id, name, &font_dims[0], &font_dims[1]);
trect.xmin += 0;
trect.xmax = trect.xmin + BLF_width(fstyle->uifont_id, name) + 10;
trect.xmax = trect.xmin + font_dims[0] + 10;
trect.ymin += 10;
trect.ymax = trect.ymin + BLF_height(fstyle->uifont_id, name);
trect.ymax = trect.ymin + font_dims[1];
uiStyleFontDraw(fstyle, &trect, name);
}

2
source/blender/editors/screen/area.c
View File

@@ -1809,5 +1809,5 @@ void ED_region_info_draw(ARegion *ar, const char *text, int block, float alpha)
/* text */
UI_ThemeColor(TH_TEXT_HI);
BLF_position(fontid, 12, rect.ymin + 5, 0.0f);
BLF_draw(fontid, text, strlen(text));
BLF_draw(fontid, text, 256);
}

14
source/blender/editors/space_clip/clip_draw.c
View File

@@ -76,19 +76,19 @@ void clip_draw_curfra_label(SpaceClip *sc, float x, float y)
uiStyle *style= UI_GetStyle();
int fontid= style->widget.uifont_id;
char str[32];
float fontsize, fontwidth;
float font_dims[2] = {0.0f, 0.0f};
/* frame number */
BLF_size(fontid, 11.0f, U.dpi);
BLI_snprintf(str, sizeof(str), "%d", sc->user.framenr);
fontsize= BLF_height(fontid, str);
fontwidth= BLF_width(fontid, str);
glRecti(x, y, x+fontwidth+6, y+fontsize+4);
BLF_width_and_height(fontid, str, &font_dims[0], &font_dims[1]);
glRecti(x, y, x + font_dims[0] + 6.0f, y + font_dims[1] + 4.0f);
UI_ThemeColor(TH_TEXT);
BLF_position(fontid, x+2.0f, y+2.0f, 0.0f);
BLF_draw(fontid, str, strlen(str));
BLF_draw(fontid, str, sizeof(str));
}
static void draw_movieclip_cache(SpaceClip *sc, ARegion *ar, MovieClip *clip, Scene *scene)
@@ -805,13 +805,13 @@ static void draw_marker_texts(SpaceClip *sc, MovieTrackingTrack *track, MovieTra
BLI_snprintf(str, sizeof(str), "%s", track->name);
BLF_position(fontid, pos[0], pos[1], 0.0f);
BLF_draw(fontid, str, strlen(str));
BLF_draw(fontid, str, sizeof(str));
pos[1]-= fontsize;
if(track->flag&TRACK_HAS_BUNDLE) {
BLI_snprintf(str, sizeof(str), "Average error: %.3f", track->error);
BLF_position(fontid, pos[0], pos[1], 0.0f);
BLF_draw(fontid, str, strlen(str));
BLF_draw(fontid, str, sizeof(str));
pos[1]-= fontsize;
}

2
source/gameengine/BlenderRoutines/KX_BlenderGL.cpp
View File

@@ -147,7 +147,7 @@ void BL_print_game_line(int fontid, const char* text, int size, int dpi, float*
BLF_size(fontid, size, dpi);
BLF_position(fontid, 0, 0, 0);
BLF_draw(fontid, (char *)text, strlen(text));
BLF_draw(fontid, (char *)text, 65535);
BLF_disable(fontid, BLF_MATRIX|BLF_ASPECT);
}

6
source/gameengine/GamePlayer/common/GPC_RenderTools.cpp
View File

@@ -305,7 +305,7 @@ void GPC_RenderTools::RenderText3D( int fontid,
BLF_size(fontid, size, dpi);
BLF_position(fontid, 0, 0, 0);
BLF_draw(fontid, (char *)text, strlen(text));
BLF_draw(fontid, text, 65535);
BLF_disable(fontid, BLF_MATRIX|BLF_ASPECT);
glEnable(GL_DEPTH_TEST);
@@ -350,11 +350,11 @@ void GPC_RenderTools::RenderText2D(RAS_TEXT_RENDER_MODE mode,
if (mode == RAS_IRenderTools::RAS_TEXT_PADDED)
{
glColor3ub(0, 0, 0);
BLF_draw_default(xco+1, height-yco-1, 0.f, text, strlen(text));
BLF_draw_default(xco+1, height-yco-1, 0.f, text, 65536);
}
glColor3ub(255, 255, 255);
BLF_draw_default(xco, height-yco, 0.f, text, strlen(text));
BLF_draw_default(xco, height-yco, 0.f, text, 65536);
// Restore view settings
glMatrixMode(GL_PROJECTION);