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:
authorTon Roosendaal <ton@blender.org>2005-05-05 23:37:22 +0400
committerTon Roosendaal <ton@blender.org>2005-05-05 23:37:22 +0400
commit1ef0359bc430b2f7fbc77df92770cd386196a056 (patch)
tree2f1e6fd389f3ede34418d75a480c39cd7aac237c /source/blender/src/edittime.c
parentb33536cdaa4639d002f52efa13f8cd450b87a5fb (diff)
Finetuning Timeline;
- Added Ckey for 'center view around current frame'. - Completed View pulldown menu with remainder of options. - prevented negative scaled views when start > end frame
Diffstat (limited to 'source/blender/src/edittime.c')
-rw-r--r--source/blender/src/edittime.c21
1 files changed, 18 insertions, 3 deletions
diff --git a/source/blender/src/edittime.c b/source/blender/src/edittime.c
index 2a297668495..4b4a2dde5a9 100644
--- a/source/blender/src/edittime.c
+++ b/source/blender/src/edittime.c
@@ -177,7 +177,7 @@ void select_timeline_markers(void)
}
}
-void nextprev_timeline_marker(int dir)
+void nextprev_timeline_marker(short dir)
{
TimeMarker *marker, *cur=NULL, *first, *last;
int mindist= MAXFRAME, dist;
@@ -318,6 +318,16 @@ void nextprev_timeline_key(short dir)
}
}
+void timeline_frame_to_center(void)
+{
+ float dtime;
+
+ dtime= CFRA*(G.scene->r.framelen) - (G.v2d->cur.xmin + G.v2d->cur.xmax)/2.0;
+ G.v2d->cur.xmin += dtime;
+ G.v2d->cur.xmax += dtime;
+ scrarea_queue_winredraw(curarea);
+}
+
/* ***************************** */
/* Right. Now for some implementation: */
@@ -412,8 +422,10 @@ void winqreadtimespace(ScrArea *sa, void *spacedata, BWinEvent *evt)
doredraw= 1;
break;
case HOMEKEY:
- G.v2d->cur.xmin=G.v2d->tot.xmin= 0.0;
- G.v2d->cur.xmax=G.v2d->tot.xmax= G.scene->r.efra;
+ first= G.scene->r.sfra;
+ if(first >= G.scene->r.efra) first= G.scene->r.efra;
+ G.v2d->cur.xmin=G.v2d->tot.xmin= (float)first-2;
+ G.v2d->cur.xmax=G.v2d->tot.xmax= (float)G.scene->r.efra+2;
doredraw= 1;
break;
@@ -435,6 +447,9 @@ void winqreadtimespace(ScrArea *sa, void *spacedata, BWinEvent *evt)
select_timeline_markers();
doredraw= 1;
break;
+ case CKEY:
+ timeline_frame_to_center();
+ break;
case GKEY: /* move marker ... not yet implemented */
break;
case EKEY: /* set end frame */