X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fviewport.cpp;h=ba26c3c1bcaf1743b0809c9d53c4b9fe44d6fbae;hp=03b07fdf13351d3ceab1e8720af701f503046335;hb=a8e3b0d777d81712e24f352fadb12e6bd33e30fa;hpb=3868e5fa3081573891ff2ae5b9dd67eb4a6afa4b

diff --git a/pv/view/viewport.cpp b/pv/view/viewport.cpp
index 03b07fdf..ba26c3c1 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);
@@ -98,7 +95,7 @@ void Viewport::mouseMoveEvent(QMouseEvent *event)
 {
 	assert(event);
 
-	if(event->buttons() & Qt::LeftButton)
+	if (event->buttons() & Qt::LeftButton)
 	{
 		_view.set_scale_offset(_view.scale(),
 			_mouse_down_offset +
@@ -107,20 +104,24 @@ void Viewport::mouseMoveEvent(QMouseEvent *event)
 	}
 }
 
-void Viewport::mouseReleaseEvent(QMouseEvent *event)
-{
-	assert(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)
 {
-	if(!_view.cursors_shown())
+	if (!_view.cursors_shown())
 		return;
 
 	p.setPen(Qt::NoPen);
@@ -137,7 +138,7 @@ void Viewport::draw_cursors_background(QPainter &p)
 
 void Viewport::draw_cursors_foreground(QPainter &p)
 {
-	if(!_view.cursors_shown())
+	if (!_view.cursors_shown())
 		return;
 
 	const QRect r = rect();