X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=pv%2Fview%2Ftimemarker.hpp;h=4f7361bd13acb5a9e119e30183c8f82a5a0a92d0;hb=1dffa582704bb6acb144a3e89bd6eb0e2ccf4f25;hp=38dfa18e61d69a6b1e679c8ffd1b1498bbf22231;hpb=4a5c385ee6a9ce387e0fe908f4d9367aa96d8342;p=pulseview.git diff --git a/pv/view/timemarker.hpp b/pv/view/timemarker.hpp index 38dfa18e..4f7361bd 100644 --- a/pv/view/timemarker.hpp +++ b/pv/view/timemarker.hpp @@ -43,7 +43,6 @@ class TimeMarker : public TimeItem public: static const int ArrowSize; - static const int Offset; protected: /** @@ -68,16 +67,10 @@ public: float get_x() const; /** - * Gets the drag point of the row item. + * Gets the arrow-tip point of the time marker. + * @param rect the rectangle of the ruler area. */ - QPoint point() const; - - /** - * Paints the marker to the viewport. - * @param p The painter to draw with. - * @param rect The rectangle of the viewport client area. - */ - virtual void paint(QPainter &p, const QRect &rect); + QPoint point(const QRect &rect) const; /** * Computes the outline rectangle of a label. @@ -95,17 +88,22 @@ public: * Paints the marker's label to the ruler. * @param p The painter to draw with. * @param rect The rectangle of the ruler client area. + * @param hover true if the label is being hovered over by the mouse. */ - void paint_label(QPainter &p, const QRect &rect); + void paint_label(QPainter &p, const QRect &rect, bool hover); - pv::widgets::Popup* create_popup(QWidget *parent); + /** + * Paints the foreground layer of the item with a QPainter + * @param p the QPainter to paint into. + * @param pp the painting parameters object to paint with. + **/ + void paint_fore(QPainter &p, const ViewItemPaintParams &pp); + + virtual pv::widgets::Popup* create_popup(QWidget *parent); private Q_SLOTS: void on_value_changed(double value); -Q_SIGNALS: - void time_changed(); - protected: const QColor &colour_;