fix computation of fixed ruler scales done before canvas width is set by allocation handler (fixes #5065 and #5095)

git-svn-id: svn://localhost/ardour2/branches/3.0@13307 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2012-10-18 15:38:04 +00:00
parent 37f2f8981f
commit 3e59452fa0
1 changed files with 3 additions and 0 deletions

View File

@ -818,6 +818,8 @@ Editor::update_fixed_rulers ()
return;
}
compute_fixed_ruler_scale ();
ruler_metrics[ruler_metric_timecode].units_per_pixel = frames_per_unit;
ruler_metrics[ruler_metric_samples].units_per_pixel = frames_per_unit;
ruler_metrics[ruler_metric_minsec].units_per_pixel = frames_per_unit;
@ -1083,6 +1085,7 @@ Editor::metric_get_timecode (GtkCustomRulerMark **marks, gdouble lower, gdouble
}
(*marks)[n].label = g_strdup (buf);
(*marks)[n].position = pos;
Timecode::increment_minutes( timecode, _session->config.get_subframes_per_frame() );
}