Merge remote-tracking branch 'origin/master' into bugfix/jogshuttle

[kdenlive] / src / smallruler.h

diff --git a/src/smallruler.h b/src/smallruler.h
index bbf033a6af69987cc0b2ec865c3eae016e17f00b..5e0a5736b1b63540a4cd4d566516b805287aee9e 100644 (file)
--- a/src/smallruler.h
+++ b/src/smallruler.h
@@ -35,18 +35,19 @@ public:
     explicit SmallRuler(MonitorManager *manager, Render *render, QWidget *parent = 0);
     virtual void mousePressEvent(QMouseEvent * event);
     virtual void mouseMoveEvent(QMouseEvent * event);
-    virtual void leaveEvent( QEvent * event );
     void adjustScale(int maximum);
     void setZone(int start, int end);
     void setZoneStart();
     void setZoneEnd();
     QPoint zone();
-    void setMarkers(QList < int > list);
+    void setMarkers(QList < CommentedTime > list);
     void updatePalette();
+    void refreshRuler();
 
 protected:
     virtual void paintEvent(QPaintEvent *e);
     virtual void resizeEvent(QResizeEvent *);
+    virtual void leaveEvent(QEvent * event);
 
 private:
     int m_cursorPosition;
@@ -58,19 +59,18 @@ private:
     int m_zoneStart;
     int m_zoneEnd;
     KStatefulBrush m_zoneBrush;
-    QList <int> m_markers;
+    QList <CommentedTime> m_markers;
     QPixmap m_pixmap;
     MonitorManager *m_manager;
     Render *m_render;
-    /** @brief True is mouse is over the ruler cursor. */
-    bool m_overCursor;
+    int m_lastSeekPosition;
+    QBrush m_cursorColor;
     void updatePixmap();
 
 public slots:
     bool slotNewValue(int value);
 
 signals:
-    void seekRenderer(int);
     void zoneChanged(QPoint);
 };