X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fruler.cpp;h=f671c95e0c9bd529d67111237ea8fc45c73da0c5;hb=f5b833c6aa7e5a4f2e9b3b60464aab0a3196ed68;hp=e0ee753138df1c6495e686070262481188d87648;hpb=249229ecc727b4e6198afac942b230ca2ac6f0b8;p=pulseview.git

diff --git a/pv/view/ruler.cpp b/pv/view/ruler.cpp
index e0ee753..f671c95 100644
--- a/pv/view/ruler.cpp
+++ b/pv/view/ruler.cpp
@@ -41,10 +41,7 @@ namespace view {
 const float Ruler::RulerHeight = 2.5f;  // x Text Height
 const int Ruler::MinorTickSubdivision = 4;
 
-const int Ruler::HoverArrowSize = 5;
-
-const int Ruler::Padding = 20;
-const int Ruler::BaselineOffset = 5;
+const float Ruler::HoverArrowSize = 0.5f;  // x Text Height
 
 Ruler::Ruler(View &parent) :
 	MarginWidget(parent)
@@ -71,9 +68,12 @@ QSize Ruler::sizeHint() const
 
 QSize Ruler::extended_size_hint() const
 {
-	const int text_height = calculate_text_height();
-	return QSize(0, RulerHeight * text_height +
-		(text_height + Padding + BaselineOffset) / 2);
+	QRectF max_rect;
+	std::vector< std::shared_ptr<TimeItem> > items(view_.time_items());
+	for (auto &i : items)
+		max_rect = max_rect.united(i->label_rect(QRect()));
+	return QSize(0, sizeHint().height() - max_rect.top() / 2 +
+		ViewItem::HighlightRadius);
 }
 
 void Ruler::paintEvent(QPaintEvent*)
@@ -136,7 +136,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<TimeItem> > items(view_.time_items());
@@ -203,7 +203,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();
 		}
@@ -252,10 +252,11 @@ void Ruler::draw_hover_mark(QPainter &p, int text_height)
 	p.setBrush(QBrush(palette().color(foregroundRole())));
 
 	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));
 }