[Bf-blender-cvs] [76015f98aec] master: Fix icon alignment for pie buttons
raa
noreply at git.blender.org
Sat Mar 11 20:34:30 CET 2017
Commit: 76015f98aec0c186240ed9cf515a2e89d2c1894c
Author: raa
Date: Sat Mar 11 22:34:09 2017 +0300
Branches: master
https://developer.blender.org/rB76015f98aec0c186240ed9cf515a2e89d2c1894c
Fix icon alignment for pie buttons
===================================================================
M source/blender/editors/interface/interface_widgets.c
===================================================================
diff --git a/source/blender/editors/interface/interface_widgets.c b/source/blender/editors/interface/interface_widgets.c
index 76c4eeef0c2..4a2c13e395f 100644
--- a/source/blender/editors/interface/interface_widgets.c
+++ b/source/blender/editors/interface/interface_widgets.c
@@ -1558,7 +1558,11 @@ static void widget_draw_text_icon(uiFontStyle *fstyle, uiWidgetColors *wcol, uiB
/* menu item - add some more padding so menus don't feel cramped. it must
* be part of the button so that this area is still clickable */
- if (ui_block_is_menu(but->block) && !ui_block_is_pie_menu(but->block))
+ if (ui_block_is_pie_menu(but->block)) {
+ if (but->dt == UI_EMBOSS_RADIAL)
+ rect->xmin += 0.3f * U.widget_unit;
+ }
+ else if (ui_block_is_menu(but->block))
rect->xmin += 0.3f * U.widget_unit;
widget_draw_icon(but, icon, alpha, rect, show_menu_icon);
More information about the Bf-blender-cvs
mailing list