[Bf-blender-cvs] [9e08019b74c] master: Fix: Icon alignment for scaled pie buttons with no text

[raa]

Commit: 9e08019b74c7032feea81db16eb9165899c3fd41
Author: raa
Date:   Tue Jun 20 20:15:04 2017 +0300
Branches: master
https://developer.blender.org/rB9e08019b74c7032feea81db16eb9165899c3fd41

Fix: Icon alignment for scaled pie buttons with no text

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

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

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

diff --git a/source/blender/editors/interface/interface.c 
b/source/blender/editors/interface/interface.c
index 7180e18ab92..64b26406f84 100644
--- a/source/blender/editors/interface/interface.c
+++ b/source/blender/editors/interface/interface.c
@@ -3168,7 +3168,9 @@ static uiBut *ui_def_but(
        }
 
        if (block->flag & UI_BLOCK_RADIAL) {
-               but->drawflag |= (UI_BUT_TEXT_LEFT | UI_BUT_ICON_LEFT);
+               but->drawflag |= UI_BUT_TEXT_LEFT;
+               if (but->str && but->str[0])
+                       but->drawflag |= UI_BUT_ICON_LEFT;
        }
        else if ((block->flag & UI_BLOCK_LOOP) ||
                 ELEM(but->type,
diff --git a/source/blender/editors/interface/interface_layout.c 
b/source/blender/editors/interface/interface_layout.c
index 30a2094fee7..da43a58bc74 100644
--- a/source/blender/editors/interface/interface_layout.c
+++ b/source/blender/editors/interface/interface_layout.c
@@ -2396,8 +2396,10 @@ static void ui_litem_layout_radial(uiLayout *litem)
                                /* add a little bit more here to include number 
*/
                                bitem->but->rect.xmax += 1.5f * UI_UNIT_X;
                                /* enable drawing as pie item if supported by 
widget */
-                               if (ui_item_is_radial_drawable(bitem))
+                               if (ui_item_is_radial_drawable(bitem)) {
                                        bitem->but->dt = UI_EMBOSS_RADIAL;
+                                       bitem->but->drawflag |= 
UI_BUT_ICON_LEFT;
+                               }
                        }
 
                        ui_item_size(item, &itemw, &itemh);

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs