diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-10-12 16:55:36 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-10-12 16:55:36 +0300 |
| commit | f2e6f8bb8d5c6aae07e9845c15eba099a7edadfd (patch) | |
| tree | 7c5174b8ea5a7c3062bfb64578d9d59f3681d2a3 /source | |
| parent | 78390f7724086851da04db7f806b4223e8049cbf (diff) | |
Fix misaligned icon in search buttons after recent changes.
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/editors/interface/interface.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/source/blender/editors/interface/interface.c b/source/blender/editors/interface/interface.c index c27d00f4087..1916023ab07 100644 --- a/source/blender/editors/interface/interface.c +++ b/source/blender/editors/interface/interface.c @@ -3320,16 +3320,13 @@ static uiBut *ui_def_but( but->drawflag |= UI_BUT_ICON_LEFT; } } - else if ((block->flag & UI_BLOCK_LOOP) || + else if (((block->flag & UI_BLOCK_LOOP) && !ui_block_is_popover(block)) || ELEM(but->type, UI_BTYPE_MENU, UI_BTYPE_TEXT, UI_BTYPE_LABEL, UI_BTYPE_BLOCK, UI_BTYPE_BUT_MENU, UI_BTYPE_SEARCH_MENU, UI_BTYPE_PROGRESS_BAR, UI_BTYPE_POPOVER)) { - but->drawflag |= UI_BUT_TEXT_LEFT; - if (but->str && but->str[0]) { - but->drawflag |= UI_BUT_ICON_LEFT; - } + but->drawflag |= (UI_BUT_TEXT_LEFT | UI_BUT_ICON_LEFT); } #ifdef USE_NUMBUTS_LR_ALIGN else if (ELEM(but->type, UI_BTYPE_NUM, UI_BTYPE_NUM_SLIDER)) { |