diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2012-10-18 15:38:04 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2012-10-18 15:38:04 +0000 |
| commit | 3e59452fa0182ace7785c62acef83cb0d213cc86 (patch) | |
| tree | b67133847718b9632e617c58b66d96c1b9a09470 | |
| parent | 37f2f8981ff44aa3cd1e46fbe9de02bba428d58e (diff) | |
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
| -rw-r--r-- | gtk2_ardour/editor_rulers.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/gtk2_ardour/editor_rulers.cc b/gtk2_ardour/editor_rulers.cc index ac771c42f0..8cc7b20416 100644 --- a/gtk2_ardour/editor_rulers.cc +++ b/gtk2_ardour/editor_rulers.cc @@ -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() ); } |