X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Ftrace.hpp;h=e6e053dac26c114828843b508a13c4bdb4819067;hp=88df33eadb0bddc74ff00b61774eba65ecdb757c;hb=f9abacf20c85333a3a6be785049e7658967e3104;hpb=2acdb232d6bb452cfdfaea3ef5218fb4da592329

diff --git a/pv/view/trace.hpp b/pv/view/trace.hpp
index 88df33ea..e6e053da 100644
--- a/pv/view/trace.hpp
+++ b/pv/view/trace.hpp
@@ -73,14 +73,20 @@ public:
 	 */
 	void set_colour(QColor colour);
 
+	/**
+	 * Computes the outline rectangle of the viewport hit-box.
+	 * @param rect the rectangle of the viewport area.
+	 * @return Returns the rectangle of the hit-box.
+	 */
+	QRectF hit_box_rect(const QRectF &rect) const;
+
 	/**
 	 * Paints the signal label.
 	 * @param p the QPainter to paint into.
-	 * @param right the x-coordinate of the right edge of the header
-	 * 	area.
+	 * @param rect the rectangle of the header area.
 	 * @param hover true if the label is being hovered over by the mouse.
 	 */
-	virtual void paint_label(QPainter &p, int right, bool hover);
+	virtual void paint_label(QPainter &p, const QRect &rect, bool hover);
 
 	virtual QMenu* create_context_menu(QWidget *parent);
 
@@ -88,30 +94,19 @@ public:
 
 	/**
 	 * Computes the outline rectangle of a label.
-	 * @param right the x-coordinate of the right edge of the header
-	 * 	area.
+	 * @param rect the rectangle of the header area.
 	 * @return Returns the rectangle of the signal label.
 	 */
-	QRectF label_rect(int right) const;
+	QRectF label_rect(const QRectF &rect) const;
 
 protected:
-
-	/**
-	 * Gets the text colour.
-	 * @remarks This colour is computed by comparing the lightness
-	 * of the trace colour against a threshold to determine whether
-	 * white or black would be more visible.
-	 */
-	QColor get_text_colour() const;
-
 	/**
 	 * Paints a zero axis across the viewport.
 	 * @param p the QPainter to paint into.
+	 * @param pp the painting parameters object to paint with.
 	 * @param y the y-offset of the axis.
-	 * @param left the x-coordinate of the left edge of the view.
-	 * @param right the x-coordinate of the right edge of the view.
 	 */
-	void paint_axis(QPainter &p, int y, int left, int right);
+	void paint_axis(QPainter &p, const ViewItemPaintParams &pp, int y);
 
 	void add_colour_option(QWidget *parent, QFormLayout *form);