Ruler: Make RulerHeight proportional to text size

diff --git a/pv/view/ruler.cpp b/pv/view/ruler.cpp
index 9b2be1d52befa07540f5a5eeecaae6764214848b..e0ee753138df1c6495e686070262481188d87648 100644 (file)
--- a/pv/view/ruler.cpp
+++ b/pv/view/ruler.cpp
@@ -38,7 +38,7 @@ using std::vector;
 namespace pv {
 namespace view {
 
-const int Ruler::RulerHeight = 30;
+const float Ruler::RulerHeight = 2.5f;  // x Text Height
 const int Ruler::MinorTickSubdivision = 4;
 
 const int Ruler::HoverArrowSize = 5;
@@ -65,13 +65,14 @@ void Ruler::clear_selection()
 
 QSize Ruler::sizeHint() const
 {
-       return QSize(0, RulerHeight);
+       const int text_height = calculate_text_height();
+       return QSize(0, RulerHeight * text_height);
 }
 
 QSize Ruler::extended_size_hint() const
 {
        const int text_height = calculate_text_height();
-       return QSize(0, RulerHeight +
+       return QSize(0, RulerHeight * text_height +
                (text_height + Padding + BaselineOffset) / 2);
 }
 
@@ -99,9 +100,9 @@ void Ruler::paintEvent(QPaintEvent*)
                first_major_division * MinorTickSubdivision) - 1;
 
        const int text_height = calculate_text_height();
+       const int ruler_height = RulerHeight * text_height;
        const int major_tick_y1 = text_height + ValueMargin * 2;
-       const int tick_y2 = RulerHeight;
-       const int minor_tick_y1 = (major_tick_y1 + tick_y2) / 2;
+       const int minor_tick_y1 = (major_tick_y1 + ruler_height) / 2;
 
        double x;
 
@@ -116,13 +117,13 @@ void Ruler::paintEvent(QPaintEvent*)
                                AlignCenter | AlignTop | TextDontClip,
                                pv::util::format_time(t, prefix));
                        p.drawLine(QPointF(x, major_tick_y1),
-                               QPointF(x, tick_y2));
+                               QPointF(x, ruler_height));
                }
                else
                {
                        // Draw a minor tick
                        p.drawLine(QPointF(x, minor_tick_y1),
-                               QPointF(x, tick_y2));
+                               QPointF(x, ruler_height));
                }
 
                division++;
@@ -130,7 +131,7 @@ void Ruler::paintEvent(QPaintEvent*)
        } while (x < width());
 
        // Draw the hover mark
-       draw_hover_mark(p);
+       draw_hover_mark(p, text_height);
 
        // The cursor labels are not drawn with the arrows exactly on the
        // bottom line of the widget, because then the selection shadow
@@ -240,7 +241,7 @@ void Ruler::keyPressEvent(QKeyEvent *e)
        }
 }
 
-void Ruler::draw_hover_mark(QPainter &p)
+void Ruler::draw_hover_mark(QPainter &p, int text_height)
 {
        const int x = view_.hover_point().x();
 
@@ -250,7 +251,7 @@ void Ruler::draw_hover_mark(QPainter &p)
        p.setPen(QPen(Qt::NoPen));
        p.setBrush(QBrush(palette().color(foregroundRole())));
 
-       const int b = RulerHeight;
+       const int b = RulerHeight * text_height;
        const QPointF points[] = {
                QPointF(x, b),
                QPointF(x - HoverArrowSize, b - HoverArrowSize),

diff --git a/pv/view/ruler.hpp b/pv/view/ruler.hpp
index a02067f3d0e987f7c294e7b11f018822a5c9cf84..c2b198ea280e47a6b037b0eaa2e387deb6068aa6 100644 (file)
--- a/pv/view/ruler.hpp
+++ b/pv/view/ruler.hpp
@@ -35,7 +35,10 @@ class Ruler : public MarginWidget
        Q_OBJECT
 
 private:
-       static const int RulerHeight;
+
+       /// Height of the ruler in multipes of the text height
+       static const float RulerHeight;
+
        static const int MinorTickSubdivision;
 
        static const int HoverArrowSize;
@@ -79,8 +82,10 @@ 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() const;