X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fruler.cpp;h=47da23a8b78e21a9e5f7725ca533f64d472897ad;hp=ceb90a45193935703d89e8af92dc30fd98f96940;hb=23e75650eba0491b2636de3cef87f893e38ae6f3;hpb=415341a11f0023cc9cec7b62cf8058c84c8b7ea6

diff --git a/pv/view/ruler.cpp b/pv/view/ruler.cpp
index ceb90a45..47da23a8 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"
@@ -43,9 +44,6 @@ const int Ruler::MinorTickSubdivision = 4;
 
 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)
 {
@@ -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());
@@ -161,31 +171,21 @@ void Ruler::mouseMoveEvent(QMouseEvent *e)
 	// Do the drag
 	dragging_ = true;
 
-	const int delta = e->pos().x() - mouse_down_point_.x();
+	const QPoint delta = e->pos() - mouse_down_point_;
 	const vector< shared_ptr<TimeItem> > items(view_.time_items());
 	for (auto &i : items)
 		if (i->dragging())
-			i->set_time(view_.offset() +
-				(i->drag_point().x() + delta - 0.5) *
-				view_.scale());
+			i->drag_by(delta);
 }
 
 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 +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();
 		}
@@ -228,6 +228,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);