diff options
| author | EitanSomething <EitanSomething> | 2019-06-03 19:13:52 +0300 |
|---|---|---|
| committer | Jacques Lucke <mail@jlucke.com> | 2019-06-03 19:17:24 +0300 |
| commit | cd90986bcb4e20a3e731a3e2d6340bb582b43f38 (patch) | |
| tree | d04837793a94403400c53f2c9c4166953d8f204c /source/blender/editors/interface/view2d.c | |
| parent | c39a8657be6d1096154222b87358dde8a8054ff1 (diff) | |
UI: Prevent scrollbars from getting too small to grab
Differential Revision: https://developer.blender.org/D5001
Diffstat (limited to 'source/blender/editors/interface/view2d.c')
| -rw-r--r-- | source/blender/editors/interface/view2d.c | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/source/blender/editors/interface/view2d.c b/source/blender/editors/interface/view2d.c index 36b984e229b..07c971aeb11 100644 --- a/source/blender/editors/interface/view2d.c +++ b/source/blender/editors/interface/view2d.c @@ -1504,12 +1504,12 @@ View2DScrollers *UI_view2d_scrollers_calc(View2D *v2d, const rcti *mask_custom) if (scrollers->hor_min > scrollers->hor_max) { scrollers->hor_min = scrollers->hor_max; } - /* prevent sliders from being too small, and disappearing */ - if ((scrollers->hor_max - scrollers->hor_min) < V2D_SCROLLER_HANDLE_SIZE) { - scrollers->hor_max = scrollers->hor_min + V2D_SCROLLER_HANDLE_SIZE; + /* prevent sliders from being too small to grab */ + if ((scrollers->hor_max - scrollers->hor_min) < V2D_MIN_SCROLLER_SIZE) { + scrollers->hor_max = scrollers->hor_min + V2D_MIN_SCROLLER_SIZE; - CLAMP(scrollers->hor_max, hor.xmin + V2D_SCROLLER_HANDLE_SIZE, hor.xmax); - CLAMP(scrollers->hor_min, hor.xmin, hor.xmax - V2D_SCROLLER_HANDLE_SIZE); + CLAMP(scrollers->hor_max, hor.xmin + V2D_MIN_SCROLLER_SIZE, hor.xmax); + CLAMP(scrollers->hor_min, hor.xmin, hor.xmax - V2D_MIN_SCROLLER_SIZE); } } @@ -1542,13 +1542,12 @@ View2DScrollers *UI_view2d_scrollers_calc(View2D *v2d, const rcti *mask_custom) if (scrollers->vert_min > scrollers->vert_max) { scrollers->vert_min = scrollers->vert_max; } - /* prevent sliders from being too small, and disappearing */ - if ((scrollers->vert_max - scrollers->vert_min) < V2D_SCROLLER_HANDLE_SIZE) { + /* prevent sliders from being too small to grab */ + if ((scrollers->vert_max - scrollers->vert_min) < V2D_MIN_SCROLLER_SIZE) { + scrollers->vert_max = scrollers->vert_min + V2D_MIN_SCROLLER_SIZE; - scrollers->vert_max = scrollers->vert_min + V2D_SCROLLER_HANDLE_SIZE; - - CLAMP(scrollers->vert_max, vert.ymin + V2D_SCROLLER_HANDLE_SIZE, vert.ymax); - CLAMP(scrollers->vert_min, vert.ymin, vert.ymax - V2D_SCROLLER_HANDLE_SIZE); + CLAMP(scrollers->vert_max, vert.ymin + V2D_MIN_SCROLLER_SIZE, vert.ymax); + CLAMP(scrollers->vert_min, vert.ymin, vert.ymax - V2D_MIN_SCROLLER_SIZE); } } |