diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-06-06 23:17:06 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-06 23:17:06 +0300 |
| commit | ba80d8440ff6f0ae566cf5f9562046c623e30b93 (patch) | |
| tree | 8f82b19997710c243c75c514393f0e5fc24d9375 /source/blender/editors/interface/interface_widgets.c | |
| parent | 1c4b04f1fde15a3be86a650b54f6e23030a97973 (diff) | |
Cleanup: style
Diffstat (limited to 'source/blender/editors/interface/interface_widgets.c')
| -rw-r--r-- | source/blender/editors/interface/interface_widgets.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/interface/interface_widgets.c b/source/blender/editors/interface/interface_widgets.c index eadefc606b3..3188bc847a7 100644 --- a/source/blender/editors/interface/interface_widgets.c +++ b/source/blender/editors/interface/interface_widgets.c @@ -2016,7 +2016,7 @@ static void widget_draw_text_icon(uiFontStyle *fstyle, uiWidgetColors *wcol, uiB but->block->aspect *= 2.0f; } #endif - + const BIFIconID icon = (but->flag & UI_HAS_ICON) ? but->icon + but->iconadd : ICON_NONE; int icon_size_init = is_tool ? ICON_DEFAULT_HEIGHT_TOOLBAR : ICON_DEFAULT_HEIGHT; const float icon_size = icon_size_init / (but->block->aspect / UI_DPI_FAC); @@ -2040,13 +2040,13 @@ static void widget_draw_text_icon(uiFontStyle *fstyle, uiWidgetColors *wcol, uiB } else if (ui_block_is_menu(but->block)) rect->xmin += 0.3f * U.widget_unit; - + widget_draw_icon(but, icon, alpha, rect, show_menu_icon); #ifdef USE_UI_TOOLBAR_HACK but->block->aspect = aspect_orig; #endif - + rect->xmin += icon_size; /* without this menu keybindings will overlap the arrow icon [#38083] */ if (show_menu_icon) { |