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

diff --git a/pv/view/ruler.cpp b/pv/view/ruler.cpp
index f671c95..7fa9987 100644
--- a/pv/view/ruler.cpp
+++ b/pv/view/ruler.cpp
@@ -22,13 +22,13 @@
 
 #include <QApplication>
 #include <QFontMetrics>
+#include <QMenu>
 #include <QMouseEvent>
 
 #include "ruler.hpp"
 #include "view.hpp"
 
 #include <pv/util.hpp>
-#include <pv/widgets/popup.hpp>
 
 using namespace Qt;
 
@@ -76,6 +76,15 @@ QSize Ruler::extended_size_hint() const
 		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*)
 {
 	const int ValueMargin = 3;
@@ -161,31 +170,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();
@@ -199,15 +198,8 @@ void Ruler::mouseReleaseEvent(QMouseEvent *)
 {
 	using pv::widgets::Popup;
 
-	if (!dragging_ && mouse_down_item_) {
-		Popup *const p = mouse_down_item_->create_popup(&view_);
-		if (p) {
-			const QPoint arrpos(mouse_down_item_->get_x(),
-				height() - ViewItem::HighlightRadius);
-			p->set_position(mapToGlobal(arrpos), Popup::Bottom);
-			p->show();
-		}
-	}
+	if (!dragging_ && mouse_down_item_)
+		show_popup(mouse_down_item_);
 
 	dragging_ = false;
 	mouse_down_item_.reset();
@@ -228,6 +220,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);