fix computation of fixed ruler scales done before canvas width is set by allocation...
authorPaul Davis <paul@linuxaudiosystems.com>
Thu, 18 Oct 2012 15:38:04 +0000 (15:38 +0000)
committerPaul Davis <paul@linuxaudiosystems.com>
Thu, 18 Oct 2012 15:38:04 +0000 (15:38 +0000)
git-svn-id: svn://localhost/ardour2/branches/3.0@13307 d708f5d6-7413-0410-9779-e7cbd77b26cf

gtk2_ardour/editor_rulers.cc

index ac771c42f0773f98126148d11b0c6f62c647b529..8cc7b2041627fe2389ec322c81ef492af1926027 100644 (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() );
                }