ViewItem: Moved in LabelPadding

[pulseview.git] / pv / view / timemarker.cpp

diff --git a/pv/view/timemarker.cpp b/pv/view/timemarker.cpp
index 399664675bd83b61c40ec484e8aa4842705625ad..47ba34559a1dd15fa45fc2ff4d979d6a23f17dab 100644 (file)
--- a/pv/view/timemarker.cpp
+++ b/pv/view/timemarker.cpp
@@ -40,7 +40,6 @@ namespace pv {
 namespace view {
 
 const int TimeMarker::ArrowSize = 4;
-const int TimeMarker::Offset = 1;
 
 TimeMarker::TimeMarker(View &view, const QColor &colour, double time) :
        TimeItem(view),
@@ -87,13 +86,13 @@ QRectF TimeMarker::label_rect(const QRectF &rect) const
        QFontMetrics m(QApplication::font());
        const float text_width =
                max(m.boundingRect(get_text()).size().width(), ArrowSize);
-       const float text_height = m.boundingRect("Tg").size().height();
+       const float text_height = m.height();
 
        const QSizeF label_size(
-               text_width + View::LabelPadding.width() * 2,
-               text_height + View::LabelPadding.height() * 2);
+               text_width + LabelPadding.width() * 2,
+               text_height + LabelPadding.height() * 2);
        const float top = rect.height() - label_size.height() -
-               TimeMarker::Offset - TimeMarker::ArrowSize - 0.5f;
+               TimeMarker::ArrowSize - 0.5f;
        const float height = label_size.height();
 
        return QRectF(x - label_size.width() / 2, top,