X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fruler.hpp;h=418d398295806ca927670c429f5a8c09ed3162f1;hp=e47c424ae6b53168535a37d6cfe68a835e6de0a4;hb=2155b66bed9f0802caec0b1e86f7f03d317a3e83;hpb=819e2e95555b2b3c2190f24a3cfa82250d1f34e5

diff --git a/pv/view/ruler.hpp b/pv/view/ruler.hpp
index e47c424a..418d3982 100644
--- a/pv/view/ruler.hpp
+++ b/pv/view/ruler.hpp
@@ -29,24 +29,21 @@ namespace pv {
 namespace view {
 
 class TimeItem;
+class ViewItem;
 
 class Ruler : public MarginWidget
 {
 	Q_OBJECT
 
 private:
-	static const int RulerHeight;
-	static const int MinorTickSubdivision;
 
-	static const int HoverArrowSize;
+	/// Height of the ruler in multipes of the text height
+	static const float RulerHeight;
 
-	static const int Padding;
+	static const int MinorTickSubdivision;
 
-	/**
-	 * The vertical offset, relative to the bottom line of the widget,
-	 * where the arrows of the cursor labels end.
-	 */
-	static const int BaselineOffset;
+	/// Height of the hover arrow in multiples of the text height
+	static const float HoverArrowSize;
 
 public:
 	Ruler(View &parent);
@@ -64,13 +61,27 @@ public:
 	 */
 	QSize extended_size_hint() const;
 
+private:
+	/**
+	 * Gets the time items.
+	 */
+	std::vector< std::shared_ptr<pv::view::ViewItem> > items();
+
+	/**
+	 * Gets the first view item which has a label that contains @c pt .
+	 * @param pt the point to search with.
+	 * @return the view item that has been found, or and empty
+	 *   @c shared_ptr if no item was found.
+	 */
+	std::shared_ptr<pv::view::ViewItem> get_mouse_over_item(
+		const QPoint &pt);
+
 private:
 	void paintEvent(QPaintEvent *event);
 
 	void mouseMoveEvent(QMouseEvent *e);
 	void mousePressEvent(QMouseEvent *e);
 	void mouseReleaseEvent(QMouseEvent *);
-	void leaveEvent(QEvent*);
 
 	void mouseDoubleClickEvent(QMouseEvent *e);
 
@@ -79,14 +90,12 @@ private:
 private:
 	/**
 	 * Draw a hover arrow under the cursor position.
+	 * @param p The painter to draw into.
+	 * @param text_height The height of a single text ascent.
 	 */
-	void draw_hover_mark(QPainter &p);
-
-	int calculate_text_height();
+	void draw_hover_mark(QPainter &p, int text_height);
 
-private:
-	std::shared_ptr<TimeItem> mouse_down_item_;
-	const int text_height_;
+	int calculate_text_height() const;
 
 private Q_SLOTS:
 	void hover_point_changed();