diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2015-01-20 06:25:39 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2015-01-20 07:50:20 +0300 |
| commit | 09eec627ed730532905b45d409f9009023623437 (patch) | |
| tree | 0b352ce642e5cf54b2ccf83c4f11485e50bdadef /source/blender/editors/interface/interface_regions.c | |
| parent | f8c52402d6c76392444a9dd9ab90d2f48b1a03fe (diff) | |
UI: cleanup UI_fontstyle_string_width, UI_draw_string
Both were maked as temp, but used often.
Now pass uiFontStyle to both, rename UI_draw_string to UI_fontstyle_draw_simple,
since its a variant of UI_fontstyle_draw that skips shadow, align... etc.
Diffstat (limited to 'source/blender/editors/interface/interface_regions.c')
| -rw-r--r-- | source/blender/editors/interface/interface_regions.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/editors/interface/interface_regions.c b/source/blender/editors/interface/interface_regions.c index 0ec59e4e4cd..21e7b8eef97 100644 --- a/source/blender/editors/interface/interface_regions.c +++ b/source/blender/editors/interface/interface_regions.c @@ -2726,7 +2726,8 @@ static uiBlock *ui_block_func_PIE(bContext *UNUSED(C), uiPopupBlockHandle *handl static float ui_pie_menu_title_width(const char *name, int icon) { - return (UI_fontstyle_string_width(name) + + const uiFontStyle *fstyle = UI_FSTYLE_WIDGET; + return (UI_fontstyle_string_width(fstyle, name) + (UI_UNIT_X * (1.50f + (icon ? 0.25f : 0.0f)))); } |