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, 10 insertions, 0 deletions

diff --git a/src/dolphincolumnview.cpp b/src/dolphincolumnview.cpp
index 907daa0d6..7257cd830 100644
--- a/src/dolphincolumnview.cpp
+++ b/src/dolphincolumnview.cpp
@@ -338,6 +338,16 @@ void DolphinColumnView::resizeEvent(QResizeEvent* event)
     assureVisibleActiveColumn();
 }
 
+void DolphinColumnView::wheelEvent(QWheelEvent* event)
+{
+    // let Ctrl+wheel events propagate to the DolphinView for icon zooming
+    if ((event->modifiers() & Qt::ControlModifier) == Qt::ControlModifier) {
+        event->ignore();
+	return;
+    }
+    QAbstractItemView::wheelEvent(event);
+}
+
 void DolphinColumnView::zoomIn()
 {
     if (isZoomInPossible()) {