Merge branch 'merge-timeline-and-viewer'

app/widget/timeruler/timeruler.cpp

@@ -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_;

app/widget/timeruler/timeruler.h

@@ -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);