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/dolphincolumnwidget.cpp | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'src/dolphincolumnwidget.cpp')

diff --git a/src/dolphincolumnwidget.cpp b/src/dolphincolumnwidget.cpp
index 3eed9f4b3..ba5632502 100644
--- a/src/dolphincolumnwidget.cpp
+++ b/src/dolphincolumnwidget.cpp
@@ -364,6 +364,16 @@ void DolphinColumnWidget::contextMenuEvent(QContextMenuEvent* event)
     }
 }
 
+void DolphinColumnWidget::wheelEvent(QWheelEvent* event)
+{
+    // let Ctrl+wheel events propagate to the DolphinView for icon zooming
+    if ((event->modifiers() & Qt::ControlModifier) == Qt::ControlModifier) {
+        event->ignore();
+	return;
+    }
+    QListView::wheelEvent(event);
+}
+
 void DolphinColumnWidget::selectionChanged(const QItemSelection& selected, const QItemSelection& deselected)
 {
     QListView::selectionChanged(selected, deselected);
-- 
cgit v1.3