Replaced use of QFontMetrics::boundingRect with height() and ascent()

diff --git a/pv/view/ruler.cpp b/pv/view/ruler.cpp
index 5bb73f63a821c25052a7c28f351a4ba3e524932e..9b2be1d52befa07540f5a5eeecaae6764214848b 100644 (file)
--- a/pv/view/ruler.cpp
+++ b/pv/view/ruler.cpp
@@ -261,9 +261,7 @@ void Ruler::draw_hover_mark(QPainter &p)
 
 int Ruler::calculate_text_height() const
 {
-       QFontMetrics fm(font());
-       return fm.boundingRect(0, 0, INT_MAX, INT_MAX,
-               Qt::AlignLeft | Qt::AlignTop, "8").height();
+       return QFontMetrics(font()).ascent();
 }
 
 void Ruler::hover_point_changed()

diff --git a/pv/view/timemarker.cpp b/pv/view/timemarker.cpp
index 399664675bd83b61c40ec484e8aa4842705625ad..4b8d2b527a5992dc43c4e58f15c68d02dcf0312d 100644 (file)
--- a/pv/view/timemarker.cpp
+++ b/pv/view/timemarker.cpp
@@ -87,7 +87,7 @@ 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,

diff --git a/pv/view/trace.cpp b/pv/view/trace.cpp
index 8411612b14a1aac109fd5cc84587efbd620f4ea3..24f97fb76da1c2f0052008354d801aef1bae2925 100644 (file)
--- a/pv/view/trace.cpp
+++ b/pv/view/trace.cpp
@@ -149,8 +149,7 @@ QRectF Trace::label_rect(const QRectF &rect) const
 
        QFontMetrics m(QApplication::font());
        const QSize text_size(
-               m.boundingRect(QRect(), 0, name_).width(),
-               m.boundingRect(QRect(), 0, "Tg").height());
+               m.boundingRect(QRect(), 0, name_).width(), m.height());
        const QSizeF label_size(
                text_size.width() + View::LabelPadding.width() * 2,
                ceilf((text_size.height() + View::LabelPadding.height() * 2) / 2) * 2);

diff --git a/pv/view/viewitempaintparams.cpp b/pv/view/viewitempaintparams.cpp
index b6a179251e0605a2361439c5c7ae501f40591b40..83dda4e59e0a02bee325662655c08aa007a1a7bf 100644 (file)
--- a/pv/view/viewitempaintparams.cpp
+++ b/pv/view/viewitempaintparams.cpp
@@ -42,8 +42,7 @@ QFont ViewItemPaintParams::font()
 }
 
 int ViewItemPaintParams::text_height() {
-       QFontMetrics m(font());
-       return m.boundingRect(QRect(), 0, "Tg").height();
+       return QFontMetrics(font()).height();
 }
 
 } // namespace view