Ruler: Removed BaselineOffset

diff --git a/pv/view/ruler.cpp b/pv/view/ruler.cpp
index ceb90a45193935703d89e8af92dc30fd98f96940..ece80e2a94bfc38c68396e09ca8a65a73c936dea 100644 (file)
--- a/pv/view/ruler.cpp
+++ b/pv/view/ruler.cpp
@@ -44,7 +44,6 @@ const int Ruler::MinorTickSubdivision = 4;
 const float Ruler::HoverArrowSize = 0.5f;  // x Text Height
 
 const int Ruler::Padding = 20;
-const int Ruler::BaselineOffset = 5;
 
 Ruler::Ruler(View &parent) :
        MarginWidget(parent)
@@ -73,7 +72,7 @@ QSize Ruler::extended_size_hint() const
 {
        const int text_height = calculate_text_height();
        return QSize(0, RulerHeight * text_height +
-               (text_height + Padding + BaselineOffset) / 2);
+               (text_height + Padding + ViewItem::HighlightRadius) / 2);
 }
 
 void Ruler::paintEvent(QPaintEvent*)
@@ -136,7 +135,7 @@ void Ruler::paintEvent(QPaintEvent*)
        // The cursor labels are not drawn with the arrows exactly on the
        // bottom line of the widget, because then the selection shadow
        // would be clipped away.
-       const QRect r = rect().adjusted(0, 0, 0, -BaselineOffset);
+       const QRect r = rect().adjusted(0, 0, 0, -ViewItem::HighlightRadius);
 
        // Draw the items
        const vector< shared_ptr<TimeItem> > items(view_.time_items());
@@ -203,7 +202,7 @@ void Ruler::mouseReleaseEvent(QMouseEvent *)
                Popup *const p = mouse_down_item_->create_popup(&view_);
                if (p) {
                        const QPoint arrpos(mouse_down_item_->get_x(),
-                               height() - BaselineOffset);
+                               height() - ViewItem::HighlightRadius);
                        p->set_position(mapToGlobal(arrpos), Popup::Bottom);
                        p->show();
                }

diff --git a/pv/view/ruler.hpp b/pv/view/ruler.hpp
index 864d611dda4607479d6bbc2f55394d5fab6d0071..f9409449b90887502223d385ab002886f2708489 100644 (file)
--- a/pv/view/ruler.hpp
+++ b/pv/view/ruler.hpp
@@ -46,12 +46,6 @@ private:
 
        static const int Padding;
 
-       /**
-        * The vertical offset, relative to the bottom line of the widget,
-        * where the arrows of the cursor labels end.
-        */
-       static const int BaselineOffset;
-
 public:
        Ruler(View &parent);