From: Joel Holdsworth <redacted>
Date: Sat, 20 Dec 2014 10:56:12 +0000 (+0000)
Subject: Ruler: Removed text_height_
X-Git-Tag: pulseview-0.3.0~338
X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=commitdiff_plain;h=e456e8e1a8514e2f53c99b63ca92e3612c2058ea

Ruler: Removed text_height_
---

diff --git a/pv/view/ruler.cpp b/pv/view/ruler.cpp
index d08cfc43..5bb73f63 100644
--- a/pv/view/ruler.cpp
+++ b/pv/view/ruler.cpp
@@ -47,8 +47,7 @@ const int Ruler::Padding = 20;
 const int Ruler::BaselineOffset = 5;
 
 Ruler::Ruler(View &parent) :
-	MarginWidget(parent),
-	text_height_(calculate_text_height())
+	MarginWidget(parent)
 {
 	setMouseTracking(true);
 
@@ -71,8 +70,9 @@ QSize Ruler::sizeHint() const
 
 QSize Ruler::extended_size_hint() const
 {
+	const int text_height = calculate_text_height();
 	return QSize(0, RulerHeight +
-		(text_height_ + Padding + BaselineOffset) / 2);
+		(text_height + Padding + BaselineOffset) / 2);
 }
 
 void Ruler::paintEvent(QPaintEvent*)
@@ -98,7 +98,8 @@ void Ruler::paintEvent(QPaintEvent*)
 	int division = (int)round(first_minor_division -
 		first_major_division * MinorTickSubdivision) - 1;
 
-	const int major_tick_y1 = text_height_ + ValueMargin * 2;
+	const int text_height = calculate_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;
 
@@ -111,7 +112,7 @@ void Ruler::paintEvent(QPaintEvent*)
 		if (division % MinorTickSubdivision == 0)
 		{
 			// Draw a major tick
-			p.drawText(x, ValueMargin, 0, text_height_,
+			p.drawText(x, ValueMargin, 0, text_height,
 				AlignCenter | AlignTop | TextDontClip,
 				pv::util::format_time(t, prefix));
 			p.drawLine(QPointF(x, major_tick_y1),
@@ -258,7 +259,7 @@ void Ruler::draw_hover_mark(QPainter &p)
 	p.drawPolygon(points, countof(points));
 }
 
-int Ruler::calculate_text_height()
+int Ruler::calculate_text_height() const
 {
 	QFontMetrics fm(font());
 	return fm.boundingRect(0, 0, INT_MAX, INT_MAX,
diff --git a/pv/view/ruler.hpp b/pv/view/ruler.hpp
index e47c424a..a02067f3 100644
--- a/pv/view/ruler.hpp
+++ b/pv/view/ruler.hpp
@@ -82,11 +82,10 @@ private:
 	 */
 	void draw_hover_mark(QPainter &p);
 
-	int calculate_text_height();
+	int calculate_text_height() const;
 
 private:
 	std::shared_ptr<TimeItem> mouse_down_item_;
-	const int text_height_;
 
 private Q_SLOTS:
 	void hover_point_changed();