From 3eca0af19cff70a2ad39d3e50bd724d813274968 Mon Sep 17 00:00:00 2001 From: Dalai Felinto Date: Tue, 1 May 2018 18:35:11 +0200 Subject: Fix number sliders for the topbar --- source/blender/editors/interface/interface_widgets.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to '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 7db74f09c69..6622ef42a64 100644 --- a/source/blender/editors/interface/interface_widgets.c +++ b/source/blender/editors/interface/interface_widgets.c @@ -3562,7 +3562,8 @@ static void widget_numslider(uiBut *but, uiWidgetColors *wcol, rcti *rect, int s factor = (value - but->softmin) / (but->softmax - but->softmin); } - factor_ui = factor * (float)BLI_rcti_size_x(rect); + float width = (float)BLI_rcti_size_x(rect); + factor_ui = factor * width; if (factor_ui <= offs) { /* Left part only. */ @@ -3570,7 +3571,7 @@ static void widget_numslider(uiBut *but, uiWidgetColors *wcol, rcti *rect, int s rect1.xmax = rect1.xmin + offs; factor_discard = factor_ui / offs; } - else if (factor_ui <= rect->xmax - offs) { + else if (factor_ui <= width - offs) { /* Left part + middle part. */ roundboxalign_slider &= ~(UI_CNR_TOP_RIGHT | UI_CNR_BOTTOM_RIGHT); rect1.xmax = rect1.xmin + factor_ui; -- cgit v1.2.3