Merge branch 'master' into blender2.8
[blender.git] / source / blender / editors / interface / interface_widgets.c
index 01150758db404d56dae64dddf4f20ba8a747cea5..e4faac5129ee948bf8f74fa90b0879b0778dd527 100644 (file)
@@ -1881,7 +1881,9 @@ static void widget_draw_text(uiFontStyle *fstyle, uiWidgetColors *wcol, uiBut *b
        }
 
 #ifdef USE_NUMBUTS_LR_ALIGN
-       if (!drawstr_right && ELEM(but->type, UI_BTYPE_NUM, UI_BTYPE_NUM_SLIDER) &&
+       if (!drawstr_right &&
+           (but->drawflag & UI_BUT_TEXT_LEFT) &&
+           ELEM(but->type, UI_BTYPE_NUM, UI_BTYPE_NUM_SLIDER) &&
            /* if we're editing or multi-drag (fake editing), then use left alignment */
            (but->editstr == NULL) && (drawstr == but->drawstr))
        {