[Bf-blender-cvs] [b313710c10f] blender-v2.90-release: Fix padding when multi-editing aligned widgets

Red Mser noreply at git.blender.org
Thu Aug 6 13:34:52 CEST 2020


Commit: b313710c10f9d1e8425daf2ff86b9c998ed1d11b
Author: Red Mser
Date:   Thu Aug 6 13:29:59 2020 +0200
Branches: blender-v2.90-release
https://developer.blender.org/rBb313710c10f9d1e8425daf2ff86b9c998ed1d11b

Fix padding when multi-editing aligned widgets

Similar to T58668, labels were not aligned when multi-editing widgets
that are not center-aligned.

Reviewed by: Hans Goudey, Julian Eisel

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

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

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 f1811031cc7..9ba1a2c73f4 100644
--- a/source/blender/editors/interface/interface_widgets.c
+++ b/source/blender/editors/interface/interface_widgets.c
@@ -2403,7 +2403,7 @@ static void widget_draw_text_icon(const uiFontStyle *fstyle,
     }
     else if (but->flag & UI_BUT_DRAG_MULTI) {
       bool text_is_edited = ui_but_drag_multi_edit_get(but) != NULL;
-      if (text_is_edited) {
+      if (text_is_edited || (but->drawflag & UI_BUT_TEXT_LEFT)) {
         rect->xmin += text_padding;
       }
     }



More information about the Bf-blender-cvs mailing list