blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 747 Projects 19 Wiki Activity

UI: fix inconsistent icon button widths for popovers and enums. 

Differential Revision: https://developer.blender.org/D4086
This commit is contained in:
Harley Acheson 2018-12-27 12:48:00 +01:00 committed by Brecht Van Lommel
parent 097b9019ce
commit e07b58537c
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source/blender/editors/interface/interface_layout.c
View File

@ -2228,7 +2228,7 @@ static uiBut *ui_item_menu(
/* pass */
}
else if (force_menu) {
w += UI_UNIT_X;
w += 0.6f * UI_UNIT_X;
}
else {
if (name[0]) {
@ -2237,12 +2237,16 @@ static uiBut *ui_item_menu(
}
}
if (name[0] && icon)
if (name[0] && icon) {
but = uiDefIconTextMenuBut(block, func, arg, icon, name, 0, 0, w, h, tip);
else if (icon)
}
else if (icon) {
but = uiDefIconMenuBut(block, func, arg, icon, 0, 0, w, h, tip);
else
UI_but_drawflag_enable(but, UI_BUT_ICON_LEFT);
}
else {
but = uiDefMenuBut(block, func, arg, name, 0, 0, w, h, tip);
}
if (argN) {
/* ugly .. */