archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix misaligned icon in search buttons after recent changes.

Browse Source
This commit is contained in:
Brecht Van Lommel
2018-10-12 15:55:36 +02:00
parent 78390f7724
commit f2e6f8bb8d
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/editors/interface/interface.c
View File

@@ -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)) {