Cursor: Don't draw cursors over each other when they have equal time

[pulseview.git] / pv / view / ruler.hpp

diff --git a/pv/view/ruler.hpp b/pv/view/ruler.hpp
index e47c424ae6b53168535a37d6cfe68a835e6de0a4..f6ce3446daaa8395ad36bf29b4ce175666aaf65a 100644 (file)
--- a/pv/view/ruler.hpp
+++ b/pv/view/ruler.hpp
@@ -35,18 +35,14 @@ 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);
@@ -79,14 +75,15 @@ 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);
+       void draw_hover_mark(QPainter &p, int text_height);
 
-       int calculate_text_height();
+       int calculate_text_height() const;
 
 private:
        std::shared_ptr<TimeItem> mouse_down_item_;
-       const int text_height_;
 
 private Q_SLOTS:
        void hover_point_changed();