Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDalai Felinto <dfelinto@gmail.com>2018-05-01 19:35:11 +0300
committerDalai Felinto <dfelinto@gmail.com>2018-05-01 19:35:11 +0300
commit3eca0af19cff70a2ad39d3e50bd724d813274968 (patch)
tree64d39a0ac06d597e5a663e38ef953d7a79cd7251 /source/blender/editors/interface/interface_widgets.c
parent334b55fd2e89d66023a499e1ce7f867d9789290d (diff)
Fix number sliders for the topbar
Diffstat (limited to 'source/blender/editors/interface/interface_widgets.c')
-rw-r--r--source/blender/editors/interface/interface_widgets.c5
1 files changed, 3 insertions, 2 deletions
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;