From aa223d1812e8974e349c18ea7eb8e1f6254b8218 Mon Sep 17 00:00:00 2001 From: Ton Roosendaal Date: Fri, 29 Oct 2004 17:21:28 +0000 Subject: [PATCH] - Two fixes: 1) Sound window displays 'frs/sec' value correct now (found a 25 hardcoded) 2) LeftMouse click in sliders of IpoWind, NLA, Action allows to make sliders smaller/larger, for quick zoom. Used to work but disappeared in early this decade or so :) --- source/blender/src/drawsound.c | 2 +- source/blender/src/editaction.c | 3 ++- source/blender/src/editnla.c | 3 ++- source/blender/src/space.c | 3 ++- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/source/blender/src/drawsound.c b/source/blender/src/drawsound.c index 77ad7eb6efc..d08f5d0ee0e 100644 --- a/source/blender/src/drawsound.c +++ b/source/blender/src/drawsound.c @@ -103,7 +103,7 @@ static void draw_sample(bSample *sample) short *sp, sampdx; /* one sample is where in v2d space? (v2d space in frames!) */ - sampfac= 25.0/(sample->rate); + sampfac= ((float)G.scene->r.frs_sec)/(sample->rate); /* how many samples? */ samples= sample->len/(sample->channels*(sample->bits/8)); diff --git a/source/blender/src/editaction.c b/source/blender/src/editaction.c index 06bade5365d..a809586e98f 100644 --- a/source/blender/src/editaction.c +++ b/source/blender/src/editaction.c @@ -2441,7 +2441,8 @@ void winqreadactionspace(ScrArea *sa, void *spacedata, BWinEvent *evt) * based on user preference USER_LMOUSESELECT */ case LEFTMOUSE: - if (mval[0]>ACTWIDTH){ + if(view2dmove(LEFTMOUSE)); // only checks for sliders + else if (mval[0]>ACTWIDTH){ do { getmouseco_areawin(mval); diff --git a/source/blender/src/editnla.c b/source/blender/src/editnla.c index cbea6a107c4..9838cb68ec2 100644 --- a/source/blender/src/editnla.c +++ b/source/blender/src/editnla.c @@ -291,7 +291,8 @@ void winqreadnlaspace(ScrArea *sa, void *spacedata, BWinEvent *evt) * based on user preference USER_LMOUSESELECT */ case LEFTMOUSE: - if (mval[0]>NLAWIDTH){ + if(view2dmove(LEFTMOUSE)); // only checks for sliders + else if (mval[0]>NLAWIDTH){ do { getmouseco_areawin(mval); diff --git a/source/blender/src/space.c b/source/blender/src/space.c index d22a024871d..29a60758294 100644 --- a/source/blender/src/space.c +++ b/source/blender/src/space.c @@ -1792,7 +1792,8 @@ static void winqreadipospace(ScrArea *sa, void *spacedata, BWinEvent *evt) if( in_ipo_buttons() ) { do_ipo_selectbuttons(); doredraw= 1; - } + } + else if(view2dmove(LEFTMOUSE)); // only checks for sliders else if(G.qual & LR_CTRLKEY) add_vert_ipo(); else { do {