From d2bfb9ae1d38534a4b835d6c0946aeeb0f62994c Mon Sep 17 00:00:00 2001 From: Joshua Leung Date: Sun, 7 Dec 2008 03:42:25 +0000 Subject: View2D: TimeCode display when displaying 'Seconds' not 'Frames' When time grids are drawn in 'seconds' not 'frames' (use the TKEY to toggle this in Timeline for testing), times are now printed in a timecode format similar to SMPTE. It deviates from SMPTE in several respects, otherwise the timecodes will collide with the current grid spacings (Note: this will be subject to review in future). * Hours will only be shown when they are needed. This shouldn't cause too many problems, since it is highly unlikely to get sequences, etc. that long. * Frames are only shown when zoomed in close enough. When they are shown, display of minutes is generally ommitted unless significant. * I've used the semicolon (;) character as the delimeter between frames and seconds. This seems to be the convention in Final Cut Pro, Vegas, and Quicktime... --- Also in this commit: * added UI_view2d_status_enforce() call to the end of UI_view2d_totRect_set(), so that the caller will not have to worry about doing so. * swapped the order of V2D_GRID_(NO)CLAMP defines so to be more consistent with older versions of Blender. Default (0) is now no-clamping. --- source/blender/editors/space_outliner/space_outliner.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source/blender/editors/space_outliner') diff --git a/source/blender/editors/space_outliner/space_outliner.c b/source/blender/editors/space_outliner/space_outliner.c index c568741f0ab..34dad277bc4 100644 --- a/source/blender/editors/space_outliner/space_outliner.c +++ b/source/blender/editors/space_outliner/space_outliner.c @@ -400,9 +400,9 @@ static void outliner_main_area_draw(const bContext *C, ARegion *ar) height= rows * ROW_HEIGHT; width= (cols + 1) * COLUMN_WIDTH; - /* need to validate view2d after updating size of tot */ + /* update size of tot-rect (extents of data/viewable area) */ UI_view2d_totRect_set(v2d, width, height); - UI_view2d_status_enforce(v2d); + rct.xmin= 0; rct.ymin= -height; -- cgit v1.2.3