X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fruler.cpp;h=ece80e2a94bfc38c68396e09ca8a65a73c936dea;hb=09d5df110bc035256dcd8287094fe1a3b8e67466;hp=9b2be1d52befa07540f5a5eeecaae6764214848b;hpb=c009650038207adcb66938170cbeb36bdf9ed63f;p=pulseview.git

diff --git a/pv/view/ruler.cpp b/pv/view/ruler.cpp
index 9b2be1d..ece80e2 100644
--- a/pv/view/ruler.cpp
+++ b/pv/view/ruler.cpp
@@ -38,13 +38,12 @@ using std::vector;
 namespace pv {
 namespace view {
 
-const int Ruler::RulerHeight = 30;
+const float Ruler::RulerHeight = 2.5f;  // x Text Height
 const int Ruler::MinorTickSubdivision = 4;
 
-const int Ruler::HoverArrowSize = 5;
+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)
@@ -65,14 +64,15 @@ void Ruler::clear_selection()
 
 QSize Ruler::sizeHint() const
 {
-	return QSize(0, RulerHeight);
+	const int text_height = calculate_text_height();
+	return QSize(0, RulerHeight * text_height);
 }
 
 QSize Ruler::extended_size_hint() const
 {
 	const int text_height = calculate_text_height();
-	return QSize(0, RulerHeight +
-		(text_height + Padding + BaselineOffset) / 2);
+	return QSize(0, RulerHeight * text_height +
+		(text_height + Padding + ViewItem::HighlightRadius) / 2);
 }
 
 void Ruler::paintEvent(QPaintEvent*)
@@ -99,9 +99,9 @@ void Ruler::paintEvent(QPaintEvent*)
 		first_major_division * MinorTickSubdivision) - 1;
 
 	const int text_height = calculate_text_height();
+	const int ruler_height = RulerHeight * 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;
+	const int minor_tick_y1 = (major_tick_y1 + ruler_height) / 2;
 
 	double x;
 
@@ -116,13 +116,13 @@ void Ruler::paintEvent(QPaintEvent*)
 				AlignCenter | AlignTop | TextDontClip,
 				pv::util::format_time(t, prefix));
 			p.drawLine(QPointF(x, major_tick_y1),
-				QPointF(x, tick_y2));
+				QPointF(x, ruler_height));
 		}
 		else
 		{
 			// Draw a minor tick
 			p.drawLine(QPointF(x, minor_tick_y1),
-				QPointF(x, tick_y2));
+				QPointF(x, ruler_height));
 		}
 
 		division++;
@@ -130,12 +130,12 @@ void Ruler::paintEvent(QPaintEvent*)
 	} while (x < width());
 
 	// Draw the hover mark
-	draw_hover_mark(p);
+	draw_hover_mark(p, text_height);
 
 	// 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());
@@ -202,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();
 		}
@@ -240,7 +240,7 @@ void Ruler::keyPressEvent(QKeyEvent *e)
 	}
 }
 
-void Ruler::draw_hover_mark(QPainter &p)
+void Ruler::draw_hover_mark(QPainter &p, int text_height)
 {
 	const int x = view_.hover_point().x();
 
@@ -250,11 +250,12 @@ void Ruler::draw_hover_mark(QPainter &p)
 	p.setPen(QPen(Qt::NoPen));
 	p.setBrush(QBrush(palette().color(foregroundRole())));
 
-	const int b = RulerHeight;
+	const int b = RulerHeight * text_height;
+	const float hover_arrow_size = HoverArrowSize * text_height;
 	const QPointF points[] = {
 		QPointF(x, b),
-		QPointF(x - HoverArrowSize, b - HoverArrowSize),
-		QPointF(x + HoverArrowSize, b - HoverArrowSize)
+		QPointF(x - hover_arrow_size, b - hover_arrow_size),
+		QPointF(x + hover_arrow_size, b - hover_arrow_size)
 	};
 	p.drawPolygon(points, countof(points));
 }