diff options
author | Campbell Barton <ideasman42@gmail.com> | 2014-01-28 21:10:39 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2014-01-28 21:10:39 +0400 |
commit | abf18033f39c09f983154d88cef1a53bce8dd75a (patch) | |
tree | 87e48bbb9535c850738f0f613cabbb4b683c087a /source/blender/editors/interface | |
parent | d34d7451a9ef52f01e03755b8d2a8931ce8d903e (diff) |
Fix T38383: glitch drawing inactive slider
Diffstat (limited to 'source/blender/editors/interface')
-rw-r--r-- | source/blender/editors/interface/interface_widgets.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/source/blender/editors/interface/interface_widgets.c b/source/blender/editors/interface/interface_widgets.c index ab9379d00fa..1724380aaf8 100644 --- a/source/blender/editors/interface/interface_widgets.c +++ b/source/blender/editors/interface/interface_widgets.c @@ -2663,6 +2663,7 @@ static void widget_numslider(uiBut *but, uiWidgetColors *wcol, rcti *rect, int s /* draw left/right parts only when not in text editing */ if (!(state & UI_TEXTINPUT)) { + int roundboxalign_slider; /* slider part */ copy_v3_v3_char(outline, wcol->outline); @@ -2687,11 +2688,15 @@ static void widget_numslider(uiBut *but, uiWidgetColors *wcol, rcti *rect, int s rect1.xmax = rect1.xmin + fac + offs; rect1.xmin += floor(offs - U.pixelsize); - if (rect1.xmax + offs > rect->xmax) + if (rect1.xmax + offs > rect->xmax) { + roundboxalign_slider = roundboxalign & ~(UI_CNR_TOP_LEFT | UI_CNR_BOTTOM_LEFT); offs *= (rect1.xmax + offs - rect->xmax) / offs; - else + } + else { + roundboxalign_slider = 0; offs = 0.0f; - round_box_edges(&wtb1, roundboxalign & ~(UI_CNR_TOP_LEFT | UI_CNR_BOTTOM_LEFT), &rect1, offs); + } + round_box_edges(&wtb1, roundboxalign_slider, &rect1, offs); widgetbase_draw(&wtb1, wcol); copy_v3_v3_char(wcol->outline, outline); |