diff options
| author | Peter Schlaile <peter@schlaile.de> | 2008-02-24 15:12:05 +0300 |
|---|---|---|
| committer | Peter Schlaile <peter@schlaile.de> | 2008-02-24 15:12:05 +0300 |
| commit | f59bbef4b3c83ecd8ce3c9cad3633aaf95a64c69 (patch) | |
| tree | 07cb87b24ba5fe1795679f484986891520420400 /source/blender/src/space.c | |
| parent | d66e9cfdf07d01c35524647d9d48ff931baf34b5 (diff) | |
== Sequencer ==
Fixes a lot of small things:
* zoom in/out in preview is more fine grained (use SHIFT)
* zebra scopes don't try to draw the border and fail
* lock/unlock now locks/unlocks all selected strips
* fix redraw problems of panel on lock/unlock
* buttons-panel is redrawn on translate, so that position information is shown
* added lock / hide to Strip-Menu
* fixed small drawing problems in header
TODO: find a good key for lock / unlock (Shift-L | Alt-Shift-L isn't that nice
to press...)
Diffstat (limited to 'source/blender/src/space.c')
| -rw-r--r-- | source/blender/src/space.c | 50 |
1 files changed, 30 insertions, 20 deletions
diff --git a/source/blender/src/space.c b/source/blender/src/space.c index 6dacf38c544..17b53e9b8b7 100644 --- a/source/blender/src/space.c +++ b/source/blender/src/space.c @@ -4746,13 +4746,19 @@ static void winqreadseqspace(ScrArea *sa, void *spacedata, BWinEvent *evt) select_more_seq(); break; } + /* fall through */ case WHEELUPMOUSE: if(sseq->mainb) { - sseq->zoom++; - if(sseq->zoom==-1) sseq->zoom= 1; + if (G.qual == LR_SHIFTKEY) { + sseq->zoom += 0.10; + } else { + sseq->zoom++; + } + if(sseq->zoom >= -1 && sseq->zoom < 1) { + sseq->zoom += 2; + } if(sseq->zoom>8) sseq->zoom= 8; - } - else { + } else { if((G.qual==0)) { dx= 0.1154f*(v2d->cur.xmax-v2d->cur.xmin); v2d->cur.xmin+= dx; @@ -4768,13 +4774,19 @@ static void winqreadseqspace(ScrArea *sa, void *spacedata, BWinEvent *evt) select_less_seq(); break; } + /* fall through */ case WHEELDOWNMOUSE: if(sseq->mainb) { - sseq->zoom--; - if(sseq->zoom==0) sseq->zoom= -2; + if (G.qual == LR_SHIFTKEY) { + sseq->zoom -= 0.10; + } else { + sseq->zoom--; + } + if(sseq->zoom >= -1 && sseq->zoom < 1) { + sseq->zoom -= 2; + } if(sseq->zoom<-8) sseq->zoom= -8; - } - else { + } else { if((G.qual==LR_SHIFTKEY)) no_gaps(); else if((G.qual==0)) { @@ -4873,11 +4885,10 @@ static void winqreadseqspace(ScrArea *sa, void *spacedata, BWinEvent *evt) select_linked_seq( 0 ); } else if((G.qual==LR_CTRLKEY)) { /* Cut at current frame */ select_linked_seq( 2 ); - } else if ((G.qual==LR_SHIFTKEY)) { - if (last_seq) { - last_seq->flag ^= SEQ_LOCK; - doredraw = 1; - } + } else if (G.qual==LR_SHIFTKEY) { + seq_lock_sel(1); + } else if (G.qual==(LR_SHIFTKEY|LR_ALTKEY)) { + seq_lock_sel(0); } break; case YKEY: @@ -4892,14 +4903,13 @@ static void winqreadseqspace(ScrArea *sa, void *spacedata, BWinEvent *evt) } else if(G.qual == 0){ make_meta(); break; /*dont redraw timeline etc */ - } else if (G.qual==LR_SHIFTKEY) { - if (last_seq) { - last_seq->flag ^= SEQ_MUTE; - doredraw = 1; - } - } else if ((G.qual==(LR_CTRLKEY|LR_ALTKEY) )) { + } else if (G.qual == LR_SHIFTKEY) { + seq_mute_sel(1); + } else if (G.qual == (LR_SHIFTKEY|LR_ALTKEY)) { + seq_mute_sel(0); + } else if (G.qual == (LR_CTRLKEY|LR_ALTKEY)) { add_marker(CFRA); - } else if ((G.qual==LR_CTRLKEY)) { + } else if (G.qual == LR_CTRLKEY) { rename_marker(); } else { break; /* do nothing */ |