Commit: b3d2b035c4f0a31f9b1ee93aee1a8fead8c99f9b
Author: Campbell Barton
Date: Wed Jun 3 14:34:04 2015 +1000
Branches: master
https://developer.blender.org/rBb3d2b035c4f0a31f9b1ee93aee1a8fead8c99f9b
Cleanup: check button flag for shortcut delimiter
===================================================================
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 d4e4dcb..9efbf53 100644
--- a/source/blender/editors/interface/interface_widgets.c
+++ b/source/blender/editors/interface/interface_widgets.c
@@ -1608,9 +1608,9 @@ static void widget_draw_text_icon(uiFontStyle *fstyle,
uiWidgetColors *wcol, uiB
else if (ELEM(but->type, UI_BTYPE_NUM, UI_BTYPE_NUM_SLIDER)) {
ui_text_clip_right_label(fstyle, but, rect);
}
- else if ((but->block->flag & UI_BLOCK_LOOP) && (but->type ==
UI_BTYPE_BUT)) {
+ else if (but->flag & UI_BUT_HAS_SEP_CHAR) {
/* Clip middle, but protect in all case right part containing
the shortcut, if any. */
- ui_text_clip_middle_protect_right(fstyle, but, rect, "|");
+ ui_text_clip_middle_protect_right(fstyle, but, rect,
UI_SEP_CHAR_S);
}
else {
ui_text_clip_middle(fstyle, but, rect);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
