Fix regression concerning Control+mouse wheel zooming

Commit 9311f4bc97ec7000be46b8eec242a8 accidentally removed
DolphinView::wheelEvent(), which is responsible for the handling of
Control+mouse wheel events. These should change the zoom level.

diff --git a/src/views/dolphinview.cpp b/src/views/dolphinview.cpp
index f2f434f462fcdb68103685c53b375444493ab231..2bd95767a8c5775b010513ec579d5d7dbe1751c8 100644 (file)
--- a/src/views/dolphinview.cpp
+++ b/src/views/dolphinview.cpp
@@ -712,6 +712,19 @@ bool DolphinView::eventFilter(QObject* watched, QEvent* event)
     return QWidget::eventFilter(watched, event);
 }
 
+void DolphinView::wheelEvent(QWheelEvent* event)
+{
+    if (event->modifiers().testFlag(Qt::ControlModifier)) {
+        const int numDegrees = event->delta() / 8;
+        const int numSteps = numDegrees / 15;
+
+        setZoomLevel(zoomLevel() + numSteps);
+        event->accept();
+    } else {
+        event->ignore();
+    }
+}
+
 void DolphinView::activate()
 {
     setActive(true);

diff --git a/src/views/dolphinview.h b/src/views/dolphinview.h
index c3981bef479b22a57115f1210227316c008b9aaa..770bbde72811c6ec9b1f19471ab14c803374591c 100644 (file)
--- a/src/views/dolphinview.h
+++ b/src/views/dolphinview.h
@@ -553,6 +553,10 @@ signals:
      */
     void writeStateChanged(bool isFolderWritable);
 
+protected:
+    /** Changes the zoom level if Control is pressed during a wheel event. */
+    virtual void wheelEvent(QWheelEvent* event);
+
 private slots:
     /**
      * Marks the view as active (DolphinView:isActive() will return true)