From 4caebde3cb9e31fcb18b36e45afa287e9c03abd4 Mon Sep 17 00:00:00 2001
From: Luciano Montanaro <mikelima@cirulla.net>
Date: Tue, 12 Feb 2008 09:27:26 +0000
Subject: 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
---
 src/dolphincolumnview.cpp | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'src/dolphincolumnview.cpp')

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()) {
-- 
cgit v1.3