X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fcustomruler.h;h=9466e83c34279df172c48f3e6925373be6e3c4e0;hb=de93dc84bc5f050272e4e736c3afa6ad5f3c6654;hp=3ebcd1079b9a3c56aa2bc3de6837217ddaccd6d4;hpb=cf96b357df6458f9c800270879517dee2755097d;p=kdenlive

diff --git a/src/customruler.h b/src/customruler.h
index 3ebcd107..9466e83c 100644
--- a/src/customruler.h
+++ b/src/customruler.h
@@ -39,22 +39,25 @@ class CustomRuler : public QWidget
     Q_OBJECT
 
 public:
-    CustomRuler(Timecode tc, CustomTrackView *parent);
+    CustomRuler(const Timecode &tc, CustomTrackView *parent);
     void setPixelPerMark(int rate);
     static const int comboScale[];
     int outPoint() const;
     int inPoint() const;
     void setDuration(int d);
-    void setZone(QPoint p);
+    void setZone(const QPoint &p);
     int offset() const;
-    void updateProjectFps(Timecode t);
-
+    void updateProjectFps(const Timecode &t);
+    void updateFrameSize();
+    void updatePalette();
+    
 protected:
-    virtual void paintEvent(QPaintEvent * /*e*/);
-    virtual void wheelEvent(QWheelEvent * e);
-    virtual void mousePressEvent(QMouseEvent * event);
-    virtual void mouseReleaseEvent(QMouseEvent * event);
-    virtual void mouseMoveEvent(QMouseEvent * event);
+    void paintEvent(QPaintEvent * /*e*/);
+    void wheelEvent(QWheelEvent * e);
+    void mousePressEvent(QMouseEvent * event);
+    void mouseReleaseEvent(QMouseEvent * event);
+    void mouseMoveEvent(QMouseEvent * event);
+    void leaveEvent(QEvent * event);
 
 private:
     Timecode m_timecode;
@@ -62,13 +65,12 @@ private:
     int m_zoneStart;
     int m_zoneEnd;
     int m_duration;
-    QColor m_bgColor;
-    QColor m_cursorColor;
     QColor m_zoneColor;
     double m_textSpacing;
     double m_factor;
     double m_scale;
     int m_offset;
+    int m_lastSeekPosition;
     RULER_MOVE m_moveCursor;
     QMenu *m_contextMenu;
     QAction *m_editGuide;
@@ -80,11 +82,13 @@ private:
     int m_startRate;
     MOUSE_MOVE m_mouseMove;
     QMenu *m_goMenu;
+    QBrush m_cursorColor;
 
 
 public slots:
     void slotMoveRuler(int newPos);
     void slotCursorMoved(int oldpos, int newpos);
+    void updateRuler();
 
 private slots:
     void slotEditGuide();
@@ -94,6 +98,7 @@ private slots:
 signals:
     void zoneMoved(int, int);
     void adjustZoom(int);
+    void mousePosition(int);
 };
 
 #endif