diff options
author | raa <roaoao@gmail.com> | 2017-03-17 16:47:19 +0300 |
---|---|---|
committer | raa <roaoao@gmail.com> | 2017-03-17 16:57:53 +0300 |
commit | 9d873fc3debe03e87eb514f51fddf29ee76983b3 (patch) | |
tree | 9f7538a847a02c2dcce706635c57819d6c2ce5b7 /source/blender/editors/interface/interface_widgets.c | |
parent | ea3d7a7f58f67b5ce690a92aa0e81e4bb836170b (diff) |
Various icon adjustments
Diffstat (limited to 'source/blender/editors/interface/interface_widgets.c')
-rw-r--r-- | source/blender/editors/interface/interface_widgets.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/source/blender/editors/interface/interface_widgets.c b/source/blender/editors/interface/interface_widgets.c index 4a2c13e395f..5ec0c49a8cd 100644 --- a/source/blender/editors/interface/interface_widgets.c +++ b/source/blender/editors/interface/interface_widgets.c @@ -873,15 +873,18 @@ static void widget_draw_icon( if (icon && icon != ICON_BLANK1) { float ofs = 1.0f / aspect; - if (but->drawflag & UI_BUT_ICON_LEFT || ui_block_is_pie_menu(but->block)) { + if (but->drawflag & UI_BUT_ICON_LEFT) { if (but->block->flag & UI_BLOCK_LOOP) { if (but->type == UI_BTYPE_SEARCH_MENU) xs = rect->xmin + 4.0f * ofs; else - xs = rect->xmin + 2.0f * ofs; + xs = rect->xmin + ofs; } else { - xs = rect->xmin + 2.0f * ofs; + if (but->dt == UI_EMBOSS_NONE || but->type == UI_BTYPE_LABEL) + xs = rect->xmin + 2.0f * ofs; + else + xs = rect->xmin + 4.0f * ofs; } ys = (rect->ymin + rect->ymax - height) / 2.0f; } |