X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fviewport.cpp;h=6b85e1b79d324c4788afc40b5903b02e0497d826;hp=2772c7764ead3a45b2c76733be6b0fe98d252c05;hb=208c6fc371951fe74ba5a08a0950f2837eef8b7b;hpb=282905348863fe871a48c680bd12bc1dee364a43

diff --git a/pv/view/viewport.cpp b/pv/view/viewport.cpp
index 2772c776..6b85e1b7 100644
--- a/pv/view/viewport.cpp
+++ b/pv/view/viewport.cpp
@@ -35,6 +35,7 @@
 using std::abs;
 using std::back_inserter;
 using std::copy;
+using std::dynamic_pointer_cast;
 using std::max;
 using std::min;
 using std::none_of;
@@ -65,6 +66,15 @@ shared_ptr<ViewItem> Viewport::get_mouse_over_item(const QPoint &pt)
 	return nullptr;
 }
 
+void Viewport::item_hover(const shared_ptr<ViewItem> &item)
+{
+	if (item)
+		setCursor(dynamic_pointer_cast<RowItem>(item) ?
+			Qt::SizeVerCursor : Qt::SizeHorCursor);
+	else
+		unsetCursor();
+}
+
 void Viewport::drag()
 {
 	drag_offset_ = view_.offset();
@@ -184,18 +194,27 @@ void Viewport::mouseDoubleClickEvent(QMouseEvent *event)
 		view_.zoom(-2.0, event->x());
 }
 
-void Viewport::wheelEvent(QWheelEvent *event)
+void Viewport::wheelEvent(QWheelEvent *e)
 {
-	assert(event);
-
-	if (event->orientation() == Qt::Vertical) {
-		// Vertical scrolling is interpreted as zooming in/out
-		view_.zoom(event->delta() / 120, event->x());
-	} else if (event->orientation() == Qt::Horizontal) {
+	assert(e);
+
+	if (e->orientation() == Qt::Vertical)
+	{
+		if (e->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));
+		} else {
+			// Vertical scrolling is interpreted as zooming in/out
+			view_.zoom(e->delta() / 120, e->x());
+		}
+	}
+	else if (e->orientation() == Qt::Horizontal)
+	{
 		// Horizontal scrolling is interpreted as moving left/right
 		view_.set_scale_offset(view_.scale(),
-				       event->delta() * view_.scale()
-				       + view_.offset());
+			e->delta() * view_.scale() + view_.offset());
 	}
 }