Move the Ctrl-wheel zoom handling to dolphinview.

The specialized views still need to ignore the Ctrl-qualified wheel events, though.

svn path=/trunk/KDE/kdebase/apps/; revision=773976

1 files changed, 17 insertions, 22 deletions

diff --git a/src/dolphiniconsview.cpp b/src/dolphiniconsview.cpp
index ccf12a737..ccf4cbfc5 100644
--- a/src/dolphiniconsview.cpp
+++ b/src/dolphiniconsview.cpp
@@ -297,29 +297,24 @@ void DolphinIconsView::keyPressEvent(QKeyEvent* event)
 
 void DolphinIconsView::wheelEvent(QWheelEvent* event)
 {
-    KCategorizedView::wheelEvent(event);
-
+    // let Ctrl+wheel events propagate to the DolphinView for icon zooming
     if ((event->modifiers() & Qt::ControlModifier) == Qt::ControlModifier) {
-        int d = event->delta();
-        if (d > 0) {
-            zoomIn();
-        } else if (d < 0) {
-            zoomOut();
-        }
-    } else {
-        // if the icons are aligned left to right, the vertical wheel event should
-        // be applied to the horizontal scrollbar
-        const IconsModeSettings* settings = DolphinSettings::instance().iconsModeSettings();
-        const bool scrollHorizontal = (event->orientation() == Qt::Vertical) &&
-                                      (settings->arrangement() == QListView::LeftToRight);
-        if (scrollHorizontal) {
-            QWheelEvent horizEvent(event->pos(),
-                                   event->delta(),
-                                   event->buttons(),
-                                   event->modifiers(),
-                                   Qt::Horizontal);
-            QApplication::sendEvent(horizontalScrollBar(), &horizEvent);
-        }
+        event->ignore();
+	return;
+    }
+    KCategorizedView::wheelEvent(event);
+    // if the icons are aligned left to right, the vertical wheel event should
+    // be applied to the horizontal scrollbar
+    const IconsModeSettings* settings = DolphinSettings::instance().iconsModeSettings();
+    const bool scrollHorizontal = (event->orientation() == Qt::Vertical) &&
+                                  (settings->arrangement() == QListView::LeftToRight);
+    if (scrollHorizontal) {
+        QWheelEvent horizEvent(event->pos(),
+                               event->delta(),
+                               event->buttons(),
+                               event->modifiers(),
+                               Qt::Horizontal);
+        QApplication::sendEvent(horizontalScrollBar(), &horizEvent);
     }
 }