Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Leung <aligorith@gmail.com>2008-12-14 11:32:21 +0300
committerJoshua Leung <aligorith@gmail.com>2008-12-14 11:32:21 +0300
commitffc0089b7b8a9d067ce96c0d0ccde8f85fefb736 (patch)
treeb6612da25ac1b21f3cb992c1988ce80b3f7ed10d /source/blender/editors/space_time
parent213f30078c3c972a9bc42b96ce35ecbaaa9429ca (diff)
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...
Diffstat (limited to 'source/blender/editors/space_time')
-rw-r--r--source/blender/editors/space_time/space_time.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/editors/space_time/space_time.c b/source/blender/editors/space_time/space_time.c
index 728beae364e..9ed69979dba 100644
--- a/source/blender/editors/space_time/space_time.c
+++ b/source/blender/editors/space_time/space_time.c
@@ -223,17 +223,17 @@ static SpaceLink *time_new(void)
ar->regiontype= RGN_TYPE_WINDOW;
ar->v2d.tot.xmin= -4.0;
- ar->v2d.tot.ymin= 0.0;
+ ar->v2d.tot.ymin= -10.0;
ar->v2d.tot.xmax= (float)EFRA + 4.0;
ar->v2d.tot.ymax= 10;
ar->v2d.cur= ar->v2d.tot;
ar->v2d.min[0]= 1.0;
- ar->v2d.min[1]= 500.0; /* XXX */
+ ar->v2d.min[1]= 20.0; /* XXX */
ar->v2d.max[0]= 32000.0;
- ar->v2d.max[1]= 500; /* XXX */
+ ar->v2d.max[1]= 20; /* XXX */
ar->v2d.minzoom= 0.1f;
ar->v2d.maxzoom= 10.0;
@@ -241,6 +241,7 @@ static SpaceLink *time_new(void)
ar->v2d.scroll |= (V2D_SCROLL_BOTTOM|V2D_SCROLL_SCALE_BOTTOM);
ar->v2d.align |= V2D_ALIGN_NO_NEG_Y;
ar->v2d.keepofs |= V2D_LOCKOFS_Y;
+ ar->v2d.keepzoom |= V2D_LOCKZOOM_Y;
return (SpaceLink*)stime;
}