X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Fruler.cpp;h=a9a8452d47fc6784d6d736762ba4938ce3408895;hb=b213ef0991a13af0c74ffe5c54382c5c455c5496;hp=049cc4af196a8c2203d0ef3ee285e9fa33f17a84;hpb=a2ae0205f2737dfd8f7647f9eae2fdcb47a0ad25;p=pulseview.git

diff --git a/pv/view/ruler.cpp b/pv/view/ruler.cpp
index 049cc4af..a9a8452d 100644
--- a/pv/view/ruler.cpp
+++ b/pv/view/ruler.cpp
@@ -30,10 +30,14 @@
 #include <math.h>
 #include <limits.h>
 
+#include <QApplication>
 #include <QMouseEvent>
 #include <QPainter>
 #include <QTextStream>
 
+#include <pv/widgets/popup.h>
+
+using namespace boost;
 using namespace std;
 
 namespace pv {
@@ -50,7 +54,7 @@ const int Ruler::HoverArrowSize = 5;
 
 Ruler::Ruler(View &parent) :
 	MarginWidget(parent),
-	_grabbed_marker(NULL)
+	_dragging(false)
 {
 	setMouseTracking(true);
 
@@ -61,8 +65,8 @@ Ruler::Ruler(View &parent) :
 void Ruler::clear_selection()
 {
 	CursorPair &cursors = _view.cursors();
-	cursors.first().select(false);
-	cursors.second().select(false);
+	cursors.first()->select(false);
+	cursors.second()->select(false);
 	update();
 }
 
@@ -181,40 +185,68 @@ void Ruler::paintEvent(QPaintEvent*)
 
 void Ruler::mouseMoveEvent(QMouseEvent *e)
 {
-	if (!_grabbed_marker)
+	if (!(e->buttons() & Qt::LeftButton))
+		return;
+	
+	if ((e->pos() - _mouse_down_point).manhattanLength() <
+		QApplication::startDragDistance())
 		return;
 
-	_grabbed_marker->set_time(_view.offset() +
-		((double)e->x() + 0.5) * _view.scale());
+	_dragging = true;
+
+	if (shared_ptr<TimeMarker> m = _grabbed_marker.lock())
+		m->set_time(_view.offset() +
+			((double)e->x() + 0.5) * _view.scale());
 }
 
 void Ruler::mousePressEvent(QMouseEvent *e)
 {
-	if (e->buttons() & Qt::LeftButton) {
-		_grabbed_marker = NULL;
+	if (e->buttons() & Qt::LeftButton)
+	{
+		_mouse_down_point = e->pos();
+
+		_grabbed_marker.reset();
+
+		clear_selection();
 
 		if (_view.cursors_shown()) {
 			CursorPair &cursors = _view.cursors();
-			if (cursors.first().get_label_rect(
+			if (cursors.first()->get_label_rect(
 				rect()).contains(e->pos()))
-				_grabbed_marker = &cursors.first();
-			else if (cursors.second().get_label_rect(
+				_grabbed_marker = cursors.first();
+			else if (cursors.second()->get_label_rect(
 				rect()).contains(e->pos()))
-				_grabbed_marker = &cursors.second();
+				_grabbed_marker = cursors.second();
 		}
+
+		if (shared_ptr<TimeMarker> m = _grabbed_marker.lock())
+			m->select();
+
+		selection_changed();
 	}
 }
 
 void Ruler::mouseReleaseEvent(QMouseEvent *)
 {
-	_grabbed_marker = NULL;
+	using pv::widgets::Popup;
+
+	if (!_dragging)
+		if (shared_ptr<TimeMarker> m = _grabbed_marker.lock()) {
+			Popup *const p = m->create_popup(&_view);
+			p->set_position(mapToGlobal(QPoint(m->get_x(),
+				height())), Popup::Bottom);
+			p->show();
+		}
+
+	_dragging = false;
+	_grabbed_marker.reset();
 }
 
 void Ruler::draw_hover_mark(QPainter &p)
 {
 	const int x = _view.hover_point().x();
 
-	if (x == -1 || _grabbed_marker)
+	if (x == -1 || _dragging)
 		return;
 
 	p.setPen(QPen(Qt::NoPen));