X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fviewport.cpp;h=f39c8201421d43956e5b6e3bc72c2768ab0cf365;hb=e314eca490a09eec9ee851787f6e8c28805a81fd;hp=6ce52abc28c4a362cf798fac507e4187c311cef7;hpb=333d5bbc0a326e6fa82db44f3e6ba8dd79cafdd8;p=pulseview.git

diff --git a/pv/view/viewport.cpp b/pv/view/viewport.cpp
index 6ce52ab..f39c820 100644
--- a/pv/view/viewport.cpp
+++ b/pv/view/viewport.cpp
@@ -59,7 +59,7 @@ int Viewport::get_total_height() const
 	return h;
 }
 
-void Viewport::paintEvent(QPaintEvent *event)
+void Viewport::paintEvent(QPaintEvent*)
 {
 	const vector< shared_ptr<Signal> > sigs(
 		_view.session().get_signals());
@@ -115,7 +115,16 @@ void Viewport::mouseReleaseEvent(QMouseEvent *event)
 void Viewport::wheelEvent(QWheelEvent *event)
 {
 	assert(event);
-	_view.zoom(event->delta() / 120, event->x());
+
+	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) {
+		// Horizontal scrolling is interpreted as moving left/right
+		_view.set_scale_offset(_view.scale(),
+				       event->delta() * _view.scale()
+				       + _view.offset());
+	}
 }
 
 void Viewport::draw_cursors_background(QPainter &p)