diff options
author | Joshua Leung <aligorith@gmail.com> | 2009-03-09 12:15:23 +0300 |
---|---|---|
committer | Joshua Leung <aligorith@gmail.com> | 2009-03-09 12:15:23 +0300 |
commit | 711d70ec46555cd6ac3699810a807b9f2430fe24 (patch) | |
tree | 8bae7e2cbe98a90c78b8eaf41f7ab31adced0437 /source/blender/editors/space_file/space_file.c | |
parent | 99ef543e56e33777a35ec663d02f162a5ab280c2 (diff) |
View2D fixes for File Browser: Scrollbars now draw correct.
Elubie, please check on the values for params->display. They were being set to zero by default...
Also, set the correct panning locks for the various views
Diffstat (limited to 'source/blender/editors/space_file/space_file.c')
-rw-r--r-- | source/blender/editors/space_file/space_file.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/source/blender/editors/space_file/space_file.c b/source/blender/editors/space_file/space_file.c index 1c7edd24df5..2c42005bed7 100644 --- a/source/blender/editors/space_file/space_file.c +++ b/source/blender/editors/space_file/space_file.c @@ -218,11 +218,17 @@ static void file_main_area_draw(const bContext *C, ARegion *ar) glClear(GL_COLOR_BUFFER_BIT); /* Allow dynamically sliders to be set, saves notifiers etc. */ - if (sfile->params && ( (sfile->params->display == FILE_IMGDISPLAY) || (sfile->params->display == FILE_LONGDISPLAY)) ) + if (sfile->params && ( (sfile->params->display == FILE_IMGDISPLAY) || (sfile->params->display == FILE_LONGDISPLAY)) ) { v2d->scroll = V2D_SCROLL_RIGHT; - else + v2d->keepofs &= ~V2D_LOCKOFS_Y; + v2d->keepofs |= V2D_LOCKOFS_X; + } + else { v2d->scroll = V2D_SCROLL_BOTTOM; - /* v2d has initialized flag, so this call will only set the mask correct */ + v2d->keepofs &= ~V2D_LOCKOFS_X; + v2d->keepofs |= V2D_LOCKOFS_Y; + } + /* v2d has initialized flag, so this call will only set the mask correct */ UI_view2d_region_reinit(v2d, V2D_COMMONVIEW_LIST, ar->winx, ar->winy); /* sets tile/border settings in sfile */ |