[Bf-blender-cvs] [17e0565cc57] master: Fix T58668: Misaligned text when editing multiple values

[Jacques Lucke]

Commit: 17e0565cc5748f959ec318c472b28ff9e41ed507
Author: Jacques Lucke
Date:   Wed Mar 13 16:26:34 2019 +0100
Branches: master
https://developer.blender.org/rB17e0565cc5748f959ec318c472b28ff9e41ed507

Fix T58668: Misaligned text when editing multiple values

Reviewers: brecht

Differential Revision: https://developer.blender.org/D4503

===================================================================

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 04a329b2607..e8657b617b9 100644
--- a/source/blender/editors/interface/interface_widgets.c
+++ b/source/blender/editors/interface/interface_widgets.c
@@ -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->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_RIGHT)) {
-		rect->xmax -= (UI_TEXT_MARGIN_X * U.widget_unit) / but->block->aspect;
+	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