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
@@ -71,6 +71,8 @@ private:

  void DrawPlayhead(QPainter* p, int x, int y);

+  int CacheStatusHeight() const;
+
  double ScreenToUnitFloat(int screen);

  int64_t ScreenToUnit(int screen);