X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fruler.cpp;h=21dd16ff398cb4b03178c12353de0ee04a9207f4;hp=ece80e2a94bfc38c68396e09ca8a65a73c936dea;hb=2155b66bed9f0802caec0b1e86f7f03d317a3e83;hpb=09d5df110bc035256dcd8287094fe1a3b8e67466

diff --git a/pv/view/ruler.cpp b/pv/view/ruler.cpp
index ece80e2a..21dd16ff 100644
--- a/pv/view/ruler.cpp
+++ b/pv/view/ruler.cpp
@@ -28,7 +28,6 @@
 #include "view.hpp"
 
 #include <pv/util.hpp>
-#include <pv/widgets/popup.hpp>
 
 using namespace Qt;
 
@@ -43,8 +42,6 @@ const int Ruler::MinorTickSubdivision = 4;
 
 const float Ruler::HoverArrowSize = 0.5f;  // x Text Height
 
-const int Ruler::Padding = 20;
-
 Ruler::Ruler(View &parent) :
 	MarginWidget(parent)
 {
@@ -70,9 +67,28 @@ 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 + ViewItem::HighlightRadius) / 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);
+}
+
+vector< shared_ptr<ViewItem> > Ruler::items()
+{
+	const vector< shared_ptr<TimeItem> > time_items(view_.time_items());
+	return vector< shared_ptr<ViewItem> >(
+		time_items.begin(), time_items.end());
+}
+
+shared_ptr<ViewItem> 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*)
@@ -160,31 +176,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();
@@ -198,15 +204,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();
@@ -216,12 +215,6 @@ void Ruler::mouseReleaseEvent(QMouseEvent *)
 		i->drag_release();
 }
 
-void Ruler::leaveEvent(QEvent*)
-{
-	mouse_point_ = QPoint(-1, -1);
-	update();
-}
-
 void Ruler::mouseDoubleClickEvent(QMouseEvent *e)
 {
 	view_.add_flag(view_.offset() + ((double)e->x() + 0.5) * view_.scale());