[Bf-blender-cvs] [5f632f9f6ed] master: Fix color width regression in 66e24ce35bb37753b8002283a72d55639bb40239

[Campbell Barton]

Commit: 5f632f9f6ed901baccf4d44fe0a2d846ccc266af
Author: Campbell Barton
Date:   Thu Sep 30 17:45:09 2021 +1000
Branches: master
https://developer.blender.org/rB5f632f9f6ed901baccf4d44fe0a2d846ccc266af

Fix color width regression in 66e24ce35bb37753b8002283a72d55639bb40239

Color buttons were drawing single icon width.

===================================================================

M	source/blender/editors/interface/interface_layout.c

===================================================================

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;
     }