X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fviewport.cpp;h=6e07a2a8baa48a7ba0f0286e867235aad701873c;hp=91b27d3ffb02ab383c3d2c801507191610a072e6;hb=d9ea96280ab1128427143660ae375c30b19aa0cb;hpb=e94f43c6539a9ec9412829550d8f025902ccc341

diff --git a/pv/view/viewport.cpp b/pv/view/viewport.cpp
index 91b27d3f..6e07a2a8 100644
--- a/pv/view/viewport.cpp
+++ b/pv/view/viewport.cpp
@@ -57,17 +57,18 @@ Viewport::Viewport(View &parent) :
 
 shared_ptr<ViewItem> Viewport::get_mouse_over_item(const QPoint &pt)
 {
+	const ViewItemPaintParams pp(rect(), view_.scale(), view_.offset());
 	const vector< shared_ptr<ViewItem> > items(this->items());
 	for (auto i = items.rbegin(); i != items.rend(); i++)
 		if ((*i)->enabled() &&
-			(*i)->hit_box_rect(rect()).contains(pt))
+			(*i)->hit_box_rect(pp).contains(pt))
 			return *i;
 	return nullptr;
 }
 
 void Viewport::item_hover(const shared_ptr<ViewItem> &item)
 {
-	if (item)
+	if (item && item->is_draggable())
 		setCursor(dynamic_pointer_cast<RowItem>(item) ?
 			Qt::SizeVerCursor : Qt::SizeHorCursor);
 	else
@@ -77,6 +78,7 @@ void Viewport::item_hover(const shared_ptr<ViewItem> &item)
 void Viewport::drag()
 {
 	drag_offset_ = view_.offset();
+	drag_v_offset_ = view_.owner_visual_v_offset();
 }
 
 void Viewport::drag_by(const QPoint &delta)
@@ -86,6 +88,8 @@ void Viewport::drag_by(const QPoint &delta)
 
 	view_.set_scale_offset(view_.scale(),
 		(*drag_offset_ - delta.x() * view_.scale()));
+
+	view_.set_v_offset(-drag_v_offset_ - delta.y());
 }
 
 void Viewport::drag_release()
@@ -178,10 +182,10 @@ void Viewport::paintEvent(QPaintEvent*)
 	for (const shared_ptr<RowItem> r : row_items)
 		r->paint_mid(p, pp);
 
-	p.setRenderHint(QPainter::Antialiasing, false);
-
 	for (const shared_ptr<RowItem> r : row_items)
 		r->paint_fore(p, pp);
+
+	p.setRenderHint(QPainter::Antialiasing, false);
 	for (const shared_ptr<TimeItem> t : time_items)
 		t->paint_fore(p, pp);
 
@@ -198,27 +202,24 @@ void Viewport::mouseDoubleClickEvent(QMouseEvent *event)
 		view_.zoom(-2.0, event->x());
 }
 
-void Viewport::wheelEvent(QWheelEvent *e)
+void Viewport::wheelEvent(QWheelEvent *event)
 {
-	assert(e);
+	assert(event);
 
-	if (e->orientation() == Qt::Vertical)
-	{
-		if (e->modifiers() & Qt::ControlModifier) {
+	if (event->orientation() == Qt::Vertical) {
+		if (event->modifiers() & Qt::ControlModifier) {
 			// Vertical scrolling with the control key pressed
 			// is intrepretted as vertical scrolling
 			view_.set_v_offset(-view_.owner_visual_v_offset() -
-				(e->delta() * height()) / (8 * 120));
+				(event->delta() * height()) / (8 * 120));
 		} else {
 			// Vertical scrolling is interpreted as zooming in/out
-			view_.zoom(e->delta() / 120, e->x());
+			view_.zoom(event->delta() / 120, event->x());
 		}
-	}
-	else if (e->orientation() == Qt::Horizontal)
-	{
+	} else if (event->orientation() == Qt::Horizontal) {
 		// Horizontal scrolling is interpreted as moving left/right
 		view_.set_scale_offset(view_.scale(),
-			e->delta() * view_.scale() + view_.offset());
+			event->delta() * view_.scale() + view_.offset());
 	}
 }