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

diff --git a/pv/view/ruler.cpp b/pv/view/ruler.cpp
index e0ee753..bcf6a52 100644
--- a/pv/view/ruler.cpp
+++ b/pv/view/ruler.cpp
@@ -22,6 +22,7 @@
 
 #include <QApplication>
 #include <QFontMetrics>
+#include <QMenu>
 #include <QMouseEvent>
 
 #include "ruler.hpp"
@@ -41,10 +42,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 +69,21 @@ 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);
+}
+
+shared_ptr<TimeItem> Ruler::get_mouse_over_item(const QPoint &pt)
+{
+	const vector< shared_ptr<TimeItem> > items(view_.time_items());
+	for (auto i = items.rbegin(); i != items.rend(); i++)
+		if ((*i)->enabled() && (*i)->label_rect(rect()).contains(pt))
+			return *i;
+	return nullptr;
 }
 
 void Ruler::paintEvent(QPaintEvent*)
@@ -136,7 +146,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());
@@ -174,18 +184,10 @@ void Ruler::mousePressEvent(QMouseEvent *e)
 {
 	if (e->buttons() & Qt::LeftButton) {
 		mouse_down_point_ = e->pos();
-
-		mouse_down_item_.reset();
+		mouse_down_item_ = get_mouse_over_item(e->pos());
 
 		clear_selection();
 
-		const vector< shared_ptr<TimeItem> > items(view_.time_items());
-		for (auto i = items.rbegin(); i != items.rend(); i++)
-			if ((*i)->label_rect(rect()).contains(e->pos())) {
-				mouse_down_item_ = (*i);
-				break;
-			}
-
 		if (mouse_down_item_) {
 			mouse_down_item_->select();
 			mouse_down_item_->drag();
@@ -203,7 +205,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();
 		}
@@ -228,6 +230,17 @@ void Ruler::mouseDoubleClickEvent(QMouseEvent *e)
 	view_.add_flag(view_.offset() + ((double)e->x() + 0.5) * view_.scale());
 }
 
+void Ruler::contextMenuEvent(QContextMenuEvent *event)
+{
+	const shared_ptr<TimeItem> r = get_mouse_over_item(mouse_point_);
+	if (!r)
+		return;
+
+	QMenu *menu = r->create_context_menu(this);
+	if (menu)
+		menu->exec(event->globalPos());
+}
+
 void Ruler::keyPressEvent(QKeyEvent *e)
 {
 	assert(e);
@@ -252,10 +265,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));
 }