Merge branch 'master' into cache-update

2022-07-01 22:32:49 -05:00
parent e97c74fd2c 8ff3544cb3
commit 7e1792cfea
98 changed files with 1638 additions and 1480 deletions
@@ -102,9 +102,8 @@ void TimeRuler::drawForeground(QPainter *p, const QRectF &rect)

  // Draw timeline points if connected
  int marker_height = TimelineMarker::GetMarkerHeight(p->fontMetrics());
-  if (GetTimelinePoints()) {
-    DrawTimelinePoints(p, marker_height);
-  }
+  DrawMarkers(p, marker_height);
+  DrawWorkArea(p);

  double width_of_frame = timebase_dbl() * GetScale();
  double width_of_second = 0;