diff layer/TimeRulerLayer.cpp @ 842:8432d2551fb2 tonioni

Update subrepos and merge from default branch
author Chris Cannam
date Tue, 02 Sep 2014 16:23:48 +0100
parents 44acc0e5e004
children 4a578a360011
line wrap: on
line diff
--- a/layer/TimeRulerLayer.cpp	Fri Jul 18 15:06:04 2014 +0100
+++ b/layer/TimeRulerLayer.cpp	Tue Sep 02 16:23:48 2014 +0100
@@ -237,6 +237,10 @@
 
     paint.save();
 
+    // Do not label time zero - we now overlay an opaque area over
+    // time < 0 which would cut it in half
+    int minlabel = 1; // ms
+
     while (1) {
 
         // frame is used to determine where to draw the lines, so it
@@ -262,7 +266,7 @@
             break;
         }
 
-	if (x >= rect.x() - 50) {
+	if (x >= rect.x() - 50 && ms >= minlabel) {
 
             RealTime rt = RealTime::fromMilliseconds(ms);