From 5f632f9f6ed901baccf4d44fe0a2d846ccc266af Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 30 Sep 2021 17:45:09 +1000 Subject: [PATCH] Fix color width regression in 66e24ce35bb37753b8002283a72d55639bb40239 Color buttons were drawing single icon width. --- source/blender/editors/interface/interface_layout.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/source/blender/editors/interface/interface_layout.c b/source/blender/editors/interface/interface_layout.c index 3437b9ad2ac..64c16e57f56 100644 --- a/source/blender/editors/interface/interface_layout.c +++ b/source/blender/editors/interface/interface_layout.c @@ -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 * 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); } 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) { layout->item.flag |= UI_ITEM_FIXED_SIZE; }