From: Joel Holdsworth Date: Sat, 20 Dec 2014 12:31:42 +0000 (+0000) Subject: Ruler: Removed BaselineOffset X-Git-Tag: pulseview-0.3.0~334 X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=09d5df110bc035256dcd8287094fe1a3b8e67466;p=pulseview.git Ruler: Removed BaselineOffset --- diff --git a/pv/view/ruler.cpp b/pv/view/ruler.cpp index ceb90a45..ece80e2a 100644 --- 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 > 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 864d611d..f9409449 100644 --- 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);