blender
/
blender
133
398
Fork 579
Code Issues 6.3k Pull Requests 752 Projects 19 Wiki Activity

UI: cleanup odd string-width check

This commit is contained in:
Campbell Barton 2014-11-11 18:39:43 +01:00
parent 2ad2236078
commit 9cc51d8ea2
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/editors/animation/anim_draw.c
View File

@ -62,7 +62,7 @@ static void draw_cfra_number(Scene *scene, View2D *v2d, const float cfra, const
{
float xscale, yscale, x, y;
char numstr[32] = " t"; /* t is the character to start replacing from */
short slen;
int slen;
/* because the frame number text is subject to the same scaling as the contents of the view */
UI_view2d_scale_get(v2d, &xscale, &yscale);
@ -79,7 +79,7 @@ static void draw_cfra_number(Scene *scene, View2D *v2d, const float cfra, const
else {
BLI_timecode_string_from_time_simple(&numstr[4], sizeof(numstr) - 4, 1, cfra);
}
slen = (short)UI_fontstyle_string_width(numstr) - 1;
slen = UI_fontstyle_string_width(numstr) - 1;
/* get starting coordinates for drawing */
x = cfra * xscale;

9
source/blender/editors/space_file/file_draw.c
View File

@ -128,12 +128,9 @@ void file_draw_buttons(const bContext *C, ARegion *ar)
}
/* Is there enough space for the execute / cancel buttons? */
loadbutton = UI_fontstyle_string_width(sfile->params->title) + btn_margin;
if (loadbutton < btn_minw) {
loadbutton = MAX2(btn_minw,
btn_margin + UI_fontstyle_string_width(params->title));
}
loadbutton = UI_fontstyle_string_width(params->title) + btn_margin;
CLAMP_MIN(loadbutton, btn_minw);
if (available_w <= loadbutton + separator + input_minw || params->title[0] == 0) {
loadbutton = 0;
}