kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fix [#19932] When reducing panels vertically the scrollbar should not continue redraw in

Browse Source 
opposite direction
This commit is contained in:
Matt Ebb 2010-01-14 04:16:45 +00:00
parent 0801544a7a
commit e93d6655bd
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
source/blender/editors/interface/view2d.c
View File

@ -1367,6 +1367,9 @@ View2DScrollers *UI_view2d_scrollers_calc(const bContext *C, View2D *v2d, short
vert.ymin+=4; vert.ymin+=4;
vert.ymax-=4; vert.ymax-=4;
CLAMP(vert.ymin, vert.ymin, vert.ymax-V2D_SCROLLER_HANDLE_SIZE);
CLAMP(hor.xmin, hor.xmin, hor.xmax-V2D_SCROLLER_HANDLE_SIZE);
/* store in scrollers, used for drawing */ /* store in scrollers, used for drawing */
scrollers->vert= vert; scrollers->vert= vert;
scrollers->hor= hor; scrollers->hor= hor;
@ -1597,8 +1600,7 @@ void UI_view2d_scrollers_draw(const bContext *C, View2D *v2d, View2DScrollers *v
state= (v2d->scroll_ui & V2D_SCROLL_H_ACTIVE)?UI_SCROLL_PRESSED:0; state= (v2d->scroll_ui & V2D_SCROLL_H_ACTIVE)?UI_SCROLL_PRESSED:0;
// TODO: disable this for button regions... if (!(v2d->keepzoom & V2D_LOCKZOOM_X) && (slider.xmax - slider.xmin > V2D_SCROLLER_HANDLE_SIZE))
if (!(v2d->keepzoom & V2D_LOCKZOOM_X))
state |= UI_SCROLL_ARROWS; state |= UI_SCROLL_ARROWS;
uiWidgetScrollDraw(&wcol, &hor, &slider, state); uiWidgetScrollDraw(&wcol, &hor, &slider, state);
@ -1695,8 +1697,7 @@ void UI_view2d_scrollers_draw(const bContext *C, View2D *v2d, View2DScrollers *v
state= (v2d->scroll_ui & V2D_SCROLL_V_ACTIVE)?UI_SCROLL_PRESSED:0; state= (v2d->scroll_ui & V2D_SCROLL_V_ACTIVE)?UI_SCROLL_PRESSED:0;
// TODO: disable this for button regions... if (!(v2d->keepzoom & V2D_LOCKZOOM_Y) && (slider.ymax - slider.ymin > V2D_SCROLLER_HANDLE_SIZE))
if (!(v2d->keepzoom & V2D_LOCKZOOM_Y))
state |= UI_SCROLL_ARROWS; state |= UI_SCROLL_ARROWS;
uiWidgetScrollDraw(&wcol, &vert, &slider, state); uiWidgetScrollDraw(&wcol, &vert, &slider, state);