Zoom refractor

imagescrollareagl.cpp

@@ -302,31 +302,29 @@ void ImageScrollAreaGL::mousePressEvent(QMouseEvent *event)
 
 void ImageScrollAreaGL::wheelEvent(QWheelEvent *event)
 {
-    if(event->angleDelta().y() > 0)
-        zoomIn();
-    else
-        zoomOut();
+    if(event->angleDelta().y() != 0)
+        zoom(event->angleDelta().y() / 1200.0f);
+}
+
+void ImageScrollAreaGL::zoom(float delta)
+{
+    if((m_scale >= 8.0f && delta > 0) || (m_scale <= 0.1f && delta < 0))return;
+
+    m_scale += delta;
+    m_imageWidget->blockRepaint(true);
+    m_imageWidget->setScale(m_scale);
+    updateScrollbars(true);
+    m_imageWidget->blockRepaint(false);
 }
 
 void ImageScrollAreaGL::zoomIn()
 {
-    if(m_scale >= 8.0f)return;
-    m_scale += 0.1f;
-    m_imageWidget->blockRepaint(true);
-    m_imageWidget->setScale(m_scale);
-    updateScrollbars(true);
-    m_imageWidget->blockRepaint(false);
+    zoom(0.1f);
 }
 
 void ImageScrollAreaGL::zoomOut()
 {
-    if(m_scale <= 0.1f)return;
-    m_scale -= 0.1f;
-    m_imageWidget->blockRepaint(true);
-    m_imageWidget->setScale(m_scale);
-    updateScrollbars(true);
-    m_imageWidget->blockRepaint(false);
-    //m_imageWidget->repaint();
+    zoom(-0.1f);
 }
 
 void ImageScrollAreaGL::bestFit()

imagescrollareagl.h

@@ -79,6 +79,7 @@ protected:
     void mouseMoveEvent(QMouseEvent *event);
     void mousePressEvent(QMouseEvent *event);
     void wheelEvent(QWheelEvent *event);
+    void zoom(float delta);
 public slots:
     void zoomIn();
     void zoomOut();