sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fix for extra string width padding in ui_text_icon_width, causing labels in right-aligned layouts show an annoying gap. If the layout is right-aligned, make the text button align right as well, so text is drawn at the right side of the alloted rect.

Browse Source
This commit is contained in:
Lukas Toenne 2013-03-21 12:58:31 +00:00
parent 0d7f7c253b
commit 8066c09df2
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1599,6 +1599,14 @@ static uiBut *uiItemL_(uiLayout *layout, const char *name, int icon)
else else
but = uiDefBut(block, LABEL, 0, name, 0, 0, w, UI_UNIT_Y, NULL, 0.0, 0.0, 0, 0, ""); but = uiDefBut(block, LABEL, 0, name, 0, 0, w, UI_UNIT_Y, NULL, 0.0, 0.0, 0, 0, "");
/* to compensate for string size padding in ui_text_icon_width,
* make text aligned right if the layout is aligned right.
*/
if (uiLayoutGetAlignment(layout) == UI_LAYOUT_ALIGN_RIGHT) {
but->flag &= ~UI_TEXT_LEFT; /* default, needs to be unset */
but->flag |= UI_TEXT_RIGHT;
}
return but; return but;
} }

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

@ -1147,6 +1147,8 @@ static void widget_draw_text(uiFontStyle *fstyle, uiWidgetColors *wcol, uiBut *b
if (but->editstr || (but->flag & UI_TEXT_LEFT)) if (but->editstr || (but->flag & UI_TEXT_LEFT))
fstyle->align = UI_STYLE_TEXT_LEFT; fstyle->align = UI_STYLE_TEXT_LEFT;
else if (but->flag & UI_TEXT_RIGHT)
fstyle->align = UI_STYLE_TEXT_RIGHT;
else else
fstyle->align = UI_STYLE_TEXT_CENTER; fstyle->align = UI_STYLE_TEXT_CENTER;
@ -1333,10 +1335,16 @@ static void widget_draw_text_icon(uiFontStyle *fstyle, uiWidgetColors *wcol, uiB
if (but->editstr || (but->flag & UI_TEXT_LEFT)) { if (but->editstr || (but->flag & UI_TEXT_LEFT)) {
rect->xmin += (UI_TEXT_MARGIN_X * U.widget_unit) / but->block->aspect; rect->xmin += (UI_TEXT_MARGIN_X * U.widget_unit) / but->block->aspect;
} }
else if ((but->flag & UI_TEXT_RIGHT)) {
rect->xmax -= (UI_TEXT_MARGIN_X * U.widget_unit) / but->block->aspect;
}
} }
else if ((but->flag & UI_TEXT_LEFT)) { else if ((but->flag & UI_TEXT_LEFT)) {
rect->xmin += (UI_TEXT_MARGIN_X * U.widget_unit) / but->block->aspect; rect->xmin += (UI_TEXT_MARGIN_X * U.widget_unit) / but->block->aspect;
} }
else if ((but->flag & UI_TEXT_RIGHT)) {
rect->xmax -= (UI_TEXT_MARGIN_X * U.widget_unit) / but->block->aspect;
}
/* unlink icon for this button type */ /* unlink icon for this button type */
if (but->type == SEARCH_MENU_UNLINK && but->drawstr[0]) { if (but->type == SEARCH_MENU_UNLINK && but->drawstr[0]) {