From 3e59452fa0182ace7785c62acef83cb0d213cc86 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Thu, 18 Oct 2012 15:38:04 +0000 Subject: [PATCH] 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 --- gtk2_ardour/editor_rulers.cc | 3 +++ 1 file changed, 3 insertions(+) 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() ); }