X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Fviewport.cpp;h=5882600524d1b77bdfaf0d02ce38ad2e040a96e3;hb=5eb0fa13029207c45748ff572568542782e6d2a8;hp=2b03b76723147852cede33b727fa6e549785d21d;hpb=ffd5cd208c277b148d0e3a85d49330149f02f0c8;p=pulseview.git

diff --git a/pv/view/viewport.cpp b/pv/view/viewport.cpp
index 2b03b767..58826005 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());
@@ -74,11 +74,8 @@ void Viewport::paintEvent(QPaintEvent *event)
 	BOOST_FOREACH(const shared_ptr<Signal> s, sigs)
 	{
 		assert(s);
-
-		const QRect signal_rect(0, s->get_v_offset() - v_offset,
-			width(), View::SignalHeight);
-
-		s->paint(p, signal_rect, _view.scale(), _view.offset());
+		s->paint(p, s->get_v_offset() - v_offset, 0, width(),
+			_view.scale(), _view.offset());
 	}
 
 	draw_cursors_foreground(p);
@@ -119,6 +116,11 @@ void Viewport::wheelEvent(QWheelEvent *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) {
+		// Horizontal scrolling is interpreted as moving left/right
+		_view.set_scale_offset(_view.scale(),
+				       event->delta() * _view.scale()
+				       + _view.offset());
 	}
 }