diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-11-11 20:39:43 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-11-11 20:40:08 +0300 |
| commit | 9cc51d8ea2b09f26b29874cdd946dce8d4651b86 (patch) | |
| tree | 0301e9583266a41cffaf853cc5f3a8793c95b465 | |
| parent | 2ad223607861b9dcd4172c05c5115b1ef931fc4b (diff) | |
UI: cleanup odd string-width check
| -rw-r--r-- | source/blender/editors/animation/anim_draw.c | 4 | ||||
| -rw-r--r-- | source/blender/editors/space_file/file_draw.c | 9 |
2 files changed, 5 insertions, 8 deletions
diff --git a/source/blender/editors/animation/anim_draw.c b/source/blender/editors/animation/anim_draw.c index 9cfe30754c4..807e1322595 100644 --- a/source/blender/editors/animation/anim_draw.c +++ b/source/blender/editors/animation/anim_draw.c @@ -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; diff --git a/source/blender/editors/space_file/file_draw.c b/source/blender/editors/space_file/file_draw.c index 81476a8ad76..6f63f315f74 100644 --- a/source/blender/editors/space_file/file_draw.c +++ b/source/blender/editors/space_file/file_draw.c @@ -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; } |