X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=sigview.cpp;h=6a2b62044ddc488959dde2c64798a5554b83a105;hp=a8e8535923d5a2acfc1a1aa2ae84ec804315d434;hb=44dbdbf82160043c6934d2cd6c08a4bd2002af91;hpb=438440ea9d4631a18b5fa95b0aefec9894c39c9b

diff --git a/sigview.cpp b/sigview.cpp
index a8e85359..6a2b6204 100644
--- a/sigview.cpp
+++ b/sigview.cpp
@@ -130,35 +130,38 @@ void SigView::dataUpdated()
 	update();
 }
 
-void SigView::mouseMoveEvent(QMouseEvent *event)
+void SigView::mousePressEvent(QMouseEvent *event)
 {
 	assert(event);
+
+	_mouse_down_point = event->pos();
+	_mouse_down_offset = _offset;
 }
 
-void SigView::mousePressEvent(QMouseEvent *event)
+void SigView::mouseMoveEvent(QMouseEvent *event)
 {
 	assert(event);
+
+	if(event->buttons() & Qt::LeftButton)
+	{
+		_offset = _mouse_down_offset + (_mouse_down_point - event->pos()).x() * _scale;
+		update();
+	}
 }
 
 void SigView::mouseReleaseEvent(QMouseEvent *event)
 {
 	assert(event);
+}
 
-	const double cursor_offset = _offset + _scale * (double)event->x();
-
-	switch(event->button())
-	{
-	case Qt::LeftButton:
-		_scale *= 2.0 / 3.0;
-		break;
-
-	case Qt::RightButton:
-		_scale *= 3.0 / 2.0;
-		break;
-	}
-
-	_offset = cursor_offset - _scale * (double)event->x();
+void SigView::wheelEvent(QWheelEvent *event)
+{
+	assert(event);
 
+	const double x = event->x() - LabelMarginWidth;
+	const double cursor_offset = _offset + _scale * x;
+	_scale *= powf(3.0/2.0, -event->delta() / 120);
+	_offset = cursor_offset - _scale * x;
 	update();
 }