Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2015-06-03 07:34:04 +0300
committerCampbell Barton <ideasman42@gmail.com>2015-06-03 07:35:41 +0300
commitb3d2b035c4f0a31f9b1ee93aee1a8fead8c99f9b (patch)
tree70ac520c151e9b14b6c981625f22d7aa350df213 /source
parent23f1c6835f58eeff54a9cf5cd4c7d85fb7e681db (diff)
Cleanup: check button flag for shortcut delimiter
Diffstat (limited to 'source')
-rw-r--r--source/blender/editors/interface/interface_widgets.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/interface/interface_widgets.c b/source/blender/editors/interface/interface_widgets.c
index d4e4dcb5c29..9efbf536df7 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);