Merge branch 'merge-timeline-and-viewer'

2020-01-04 02:45:26 +11:00
parent 0463106187 df837efbc6
commit 31b60664a7
22 changed files with 194 additions and 368 deletions
@@ -339,6 +339,11 @@ void TimeRuler::DrawPlayhead(QPainter *p, int x, int y)
  p->drawPolygon(points, 6);
 }

+int TimeRuler::CacheStatusHeight() const
+{
+  return fontMetrics().height() / 4;
+}
+
 double TimeRuler::ScreenToUnitFloat(int screen)
 {
  return (screen + scroll_) / scale_ / timebase_dbl_;