diff options
| author | Ton Roosendaal <ton@blender.org> | 2009-04-10 20:30:28 +0400 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2009-04-10 20:30:28 +0400 |
| commit | 4e81404d7eb00d7373ea8e4c01ae8bdfad287d72 (patch) | |
| tree | e0414e0bea32707785061910589d173c112756a6 /source/blender/editors/animation/anim_draw.c | |
| parent | 61249337817d3699ca961c9e4007cb0cdb232051 (diff) | |
2.5
Grand cleanup:
- removal of FTF and ftfont dir
- removal of text.c which wrapped it
- wrapped old text drawing code temporarily, need to decide how 'style'
will behave per editor when you draw strings outside interface code....
wouldn't be very useful to set fonts locally all over?
Diffstat (limited to 'source/blender/editors/animation/anim_draw.c')
| -rw-r--r-- | source/blender/editors/animation/anim_draw.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/source/blender/editors/animation/anim_draw.c b/source/blender/editors/animation/anim_draw.c index e0962eadfca..7f07de80754 100644 --- a/source/blender/editors/animation/anim_draw.c +++ b/source/blender/editors/animation/anim_draw.c @@ -62,7 +62,6 @@ #include "UI_interface.h" #include "UI_resources.h" -#include "UI_text.h" #include "UI_view2d.h" /* XXX */ @@ -86,7 +85,7 @@ static void draw_cfra_number (Scene *scene, View2D *v2d, float cfra, short time) sprintf(str, " %.2f", FRA2TIME(CFRA)); else sprintf(str, " %d", CFRA); - slen= (short)UI_GetStringWidth(G.font, str, 0) - 1; + slen= (short)UI_GetStringWidth(str) - 1; /* get starting coordinates for drawing */ x= cfra * xscale; @@ -98,8 +97,7 @@ static void draw_cfra_number (Scene *scene, View2D *v2d, float cfra, short time) /* draw current frame number - black text */ UI_ThemeColor(TH_TEXT); - ui_rasterpos_safe(x-5, y+3, 1.0f); - UI_DrawString(G.fonts, str, 0); // XXX may need to be updated for font stuff + UI_DrawString(x-5, y+3, str); // XXX may need to be updated for font stuff /* restore view transform */ glScalef(xscale, 1.0, 1.0); |