X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fviewport.cpp;h=9e136664f5078b1510dbef92d57c972b61d981ba;hp=3811c1e8a143d70b6dc8f03115d1ead1e529c07e;hb=3370799041d0ee09bf1c7c4f006933778579c037;hpb=d75c5d12963b35bd8a8c507f565ec5c57fbdaac6

diff --git a/pv/view/viewport.cpp b/pv/view/viewport.cpp
index 3811c1e8..9e136664 100644
--- a/pv/view/viewport.cpp
+++ b/pv/view/viewport.cpp
@@ -78,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)
@@ -87,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()
@@ -203,8 +206,7 @@ void Viewport::wheelEvent(QWheelEvent *e)
 {
 	assert(e);
 
-	if (e->orientation() == Qt::Vertical)
-	{
+	if (e->orientation() == Qt::Vertical) {
 		if (e->modifiers() & Qt::ControlModifier) {
 			// Vertical scrolling with the control key pressed
 			// is intrepretted as vertical scrolling
@@ -214,9 +216,7 @@ void Viewport::wheelEvent(QWheelEvent *e)
 			// Vertical scrolling is interpreted as zooming in/out
 			view_.zoom(e->delta() / 120, e->x());
 		}
-	}
-	else if (e->orientation() == Qt::Horizontal)
-	{
+	} else if (e->orientation() == Qt::Horizontal) {
 		// Horizontal scrolling is interpreted as moving left/right
 		view_.set_scale_offset(view_.scale(),
 			e->delta() * view_.scale() + view_.offset());