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
path: root/source
diff options
context:
space:
mode:
authorMatt Ebb <matt@mke3.net>2006-01-30 19:34:18 +0300
committerMatt Ebb <matt@mke3.net>2006-01-30 19:34:18 +0300
commit1c3ece991591c3a939235bc9c63c9f939eab3ed6 (patch)
tree18649c7a11d7fe5a954d8309ae1e08e94d966bc1 /source
parent6b7c992920caf93d27bd688ba04ad31084bf1b3f (diff)
* Allow the Sequence editor to scale in Y axis too. Why was this never enabled?
Diffstat (limited to 'source')
-rw-r--r--source/blender/src/drawipo.c15
1 files changed, 12 insertions, 3 deletions
diff --git a/source/blender/src/drawipo.c b/source/blender/src/drawipo.c
index e6280b6a6f4..709c344bd2c 100644
--- a/source/blender/src/drawipo.c
+++ b/source/blender/src/drawipo.c
@@ -2164,7 +2164,7 @@ int view2dzoom(unsigned short event)
}
}
}
- if(ELEM(event, WHEELUPMOUSE, WHEELDOWNMOUSE) || mval[0]!=mvalo[0] || mval[1]!=mvalo[1]) {
+ if (ELEM(event, WHEELUPMOUSE, WHEELDOWNMOUSE) || mval[0]!=mvalo[0] || mval[1]!=mvalo[1]) {
if(U.viewzoom!=USER_ZOOM_CONT) {
mvalo[0]= mval[0];
@@ -2181,10 +2181,19 @@ int view2dzoom(unsigned short event)
G.v2d->cur.xmax-= dx;
}
}
- else if (ELEM3(curarea->spacetype, SPACE_SEQ, SPACE_SOUND, SPACE_TIME)) {
+ else if (ELEM(curarea->spacetype, SPACE_SOUND, SPACE_TIME)) {
G.v2d->cur.xmin+= dx;
G.v2d->cur.xmax-= dx;
}
+ else if (curarea->spacetype == SPACE_SEQ) {
+ /* less sensitivity on y scale */
+ G.v2d->cur.xmin+= dx;
+ G.v2d->cur.xmax-= dx;
+ if (!(ELEM(event, WHEELUPMOUSE, WHEELDOWNMOUSE))) {
+ G.v2d->cur.ymin+= dy/2;
+ G.v2d->cur.ymax-= dy/2;
+ }
+ }
else {
G.v2d->cur.xmin+= dx;
G.v2d->cur.xmax-= dx;
@@ -2298,7 +2307,7 @@ int view2dmove(unsigned short event)
else left= 0.0;
leftret= 0;
}
- }
+ }
}
else {
facx= (G.v2d->cur.xmax-G.v2d->cur.xmin)/(float)(curarea->winx);