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

Fix T58668: Misaligned text when editing multiple values

Browse Source 
Reviewers: brecht

Differential Revision: https://developer.blender.org/D4503
This commit is contained in:
Jacques Lucke
2019-03-13 16:26:34 +01:00
parent 3952fd199a
commit 17e0565cc5
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2143,11 +2143,21 @@ static void widget_draw_text_icon(const uiFontStyle *fstyle, const uiWidgetColor
rect->xmin += icon_size + icon_padding;
}
if (but->editstr || (but->drawflag & UI_BUT_TEXT_LEFT)) {
rect->xmin += (UI_TEXT_MARGIN_X * U.widget_unit) / but->block->aspect;
int text_padding = (UI_TEXT_MARGIN_X * U.widget_unit) / but->block->aspect;
if (but->editstr) {
rect->xmin += text_padding;
}
else if ((but->drawflag & UI_BUT_TEXT_RIGHT)) {
rect->xmax -= (UI_TEXT_MARGIN_X * U.widget_unit) / but->block->aspect;
else if (but->flag & UI_BUT_DRAG_MULTI) {
bool text_is_edited = ui_but_drag_multi_edit_get(but) != NULL;
if (text_is_edited) {
rect->xmin += text_padding;
}
}
else if (but->drawflag & UI_BUT_TEXT_LEFT) {
rect->xmin += text_padding;
}
else if (but->drawflag & UI_BUT_TEXT_RIGHT) {
rect->xmax -= text_padding;
}
/* Menu contains sub-menu items with triangle icon on their right. Shortcut