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

Fix color width regression in 66e24ce35b

Browse Source 
Color buttons were drawing single icon width.
This commit is contained in:
Campbell Barton
2021-09-30 17:45:09 +10:00
parent af13168a3f
commit 5f632f9f6e
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -339,11 +339,15 @@ static int ui_text_icon_width_ex(uiLayout *layout,
/* When there is no text, always behave as if this is an icon-only button /* When there is no text, always behave as if this is an icon-only button
* since it's not useful to return empty space. */ * since it's not useful to return empty space. */
if (!name[0]) { if (icon && !name[0]) {
return unit_x * (1.0f + pad_factor->icon_only); return unit_x * (1.0f + pad_factor->icon_only);
} }
if (ui_layout_variable_size(layout)) { if (ui_layout_variable_size(layout)) {
if (!icon && !name[0]) {
return unit_x * (1.0f + pad_factor->icon_only);
}
if (layout->alignment != UI_LAYOUT_ALIGN_EXPAND) { if (layout->alignment != UI_LAYOUT_ALIGN_EXPAND) {
layout->item.flag |= UI_ITEM_FIXED_SIZE; layout->item.flag |= UI_ITEM_FIXED_SIZE;
} }