archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

UI: don't attempt to draw with the menu-key when only drawing right aligned

Browse Source
This commit is contained in:
Campbell Barton
2013-12-17 13:11:31 +11:00
parent d9634122f6
commit 305fc82541
1 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/editors/interface/interface_widgets.c
View File

@@ -1122,9 +1122,6 @@ static void widget_draw_text(uiFontStyle *fstyle, uiWidgetColors *wcol, uiBut *b
char *drawstr_right = NULL; char *drawstr_right = NULL;
bool use_right_only = false; bool use_right_only = false;
/* for underline drawing */
float font_xofs, font_yofs;
uiStyleFontSet(fstyle); uiStyleFontSet(fstyle);
if (but->editstr || (but->drawflag & UI_BUT_TEXT_LEFT)) if (but->editstr || (but->drawflag & UI_BUT_TEXT_LEFT))
@@ -1217,9 +1214,11 @@ static void widget_draw_text(uiFontStyle *fstyle, uiWidgetColors *wcol, uiBut *b
glColor4ubv((unsigned char *)wcol->text); glColor4ubv((unsigned char *)wcol->text);
if (!use_right_only) { if (!use_right_only) {
/* for underline drawing */
float font_xofs, font_yofs;
uiStyleFontDrawExt(fstyle, rect, but->drawstr + but->ofs, uiStyleFontDrawExt(fstyle, rect, but->drawstr + but->ofs,
drawstr_left_len - but->ofs, &font_xofs, &font_yofs); drawstr_left_len - but->ofs, &font_xofs, &font_yofs);
}
if (but->menu_key != '\0') { if (but->menu_key != '\0') {
char fixedbuf[128]; char fixedbuf[128];
@@ -1252,6 +1251,7 @@ static void widget_draw_text(uiFontStyle *fstyle, uiWidgetColors *wcol, uiBut *b
} }
} }
} }
}
/* part text right aligned */ /* part text right aligned */
if (drawstr_right) { if (drawstr_right) {