From ffc0089b7b8a9d067ce96c0d0ccde8f85fefb736 Mon Sep 17 00:00:00 2001 From: Joshua Leung Date: Sun, 14 Dec 2008 08:32:21 +0000 Subject: View2D: Cosmetic changes and bugfixes * Scrollers now draw using nice rounded+shaded style everywhere * When scrollers 'bubble' completely fills a scroller or is completely out of view, the view zooming using the handles is now only activated if the mouse is within a quarter of the total length of the scroller on either end of the scroller. Otherwise, pan is activated. This should make the scrollers more usable in anim editors. * Fixed drawing of gridlines in TimeLine - needed to adjust ymin value of cur and tot rects to accomodate for the new mask/cur adjustments as old TimeLines didn't draw with 'real' scrollbars. Also, adjusted min/max values to fit these new tot/cur rect y-sizes. * Tidying up vars and fixing errors in declaring new View2D types in preparation for simpler method of initialising views... --- source/blender/editors/space_outliner/space_outliner.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'source/blender/editors/space_outliner') diff --git a/source/blender/editors/space_outliner/space_outliner.c b/source/blender/editors/space_outliner/space_outliner.c index 7ddcd87d867..c687ca17907 100644 --- a/source/blender/editors/space_outliner/space_outliner.c +++ b/source/blender/editors/space_outliner/space_outliner.c @@ -484,11 +484,9 @@ static SpaceLink *outliner_new(void) BLI_addtail(&soutliner->regionbase, ar); ar->regiontype= RGN_TYPE_WINDOW; - ar->v2d.scroll |= V2D_SCROLL_RIGHT; + ar->v2d.scroll = (V2D_SCROLL_RIGHT|V2D_SCROLL_BOTTOM_O); ar->v2d.align = (V2D_ALIGN_NO_NEG_X|V2D_ALIGN_NO_POS_Y); - ar->v2d.keepzoom |= (V2D_LOCKZOOM_X|V2D_LOCKZOOM_Y); - ar->v2d.keepaspect= 1; - ar->v2d.keepzoom= 1; + ar->v2d.keepzoom = (V2D_LOCKZOOM_X|V2D_LOCKZOOM_Y|V2D_KEEPZOOM|V2D_KEEPASPECT); ar->v2d.keeptot= 2; /* XXX make define */ return (SpaceLink*)soutliner; -- cgit v1.2.3