DolphinView zoom with CTRL+MouseWheel REVIEW: 102490

diff --git a/src/kitemviews/kitemlistcontainer.cpp b/src/kitemviews/kitemlistcontainer.cpp
index 0d2637da633f658add93bf54c9e092dcf53ca6f2..c68af6d94f0584667caaa6fd38ae3f6834021ae9 100644 (file)
--- a/src/kitemviews/kitemlistcontainer.cpp
+++ b/src/kitemviews/kitemlistcontainer.cpp
@@ -199,7 +199,13 @@ bool KItemListContainer::eventFilter(QObject* obj, QEvent* event)
 
 void KItemListContainer::wheelEvent(QWheelEvent* event)
 {
 
 void KItemListContainer::wheelEvent(QWheelEvent* event)
 {

+    if (event->modifiers().testFlag(Qt::ControlModifier)) {
+        event->ignore();
+        return;
+    }
+

     KItemListView* view = m_controller->view();
     KItemListView* view = m_controller->view();

+    

     if (!view || event->orientation() != view->scrollOrientation()) {
         return;
     }
     if (!view || event->orientation() != view->scrollOrientation()) {
         return;
     }

diff --git a/src/views/dolphinview.cpp b/src/views/dolphinview.cpp
index 0991401773af3307b8d1d63fe6a2e0232f371168..d00c5c0770aff15960f3a8c582e7b22594b6980d 100644 (file)
--- a/src/views/dolphinview.cpp
+++ b/src/views/dolphinview.cpp
@@ -684,6 +684,17 @@ void DolphinView::contextMenuEvent(QContextMenuEvent* 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();
+}
+

 void DolphinView::activate()
 {
     setActive(true);
 void DolphinView::activate()
 {
     setActive(true);

diff --git a/src/views/dolphinview.h b/src/views/dolphinview.h
index 7c81ea8fcfc4d13100dbb5c2a2a2e9ac314044f5..085de332d5f5173849eba75855c25196409dff71 100644 (file)
--- a/src/views/dolphinview.h
+++ b/src/views/dolphinview.h
@@ -544,6 +544,7 @@ signals:
 protected:
     virtual void mouseReleaseEvent(QMouseEvent* event);
     virtual void contextMenuEvent(QContextMenuEvent* event);
 protected:
     virtual void mouseReleaseEvent(QMouseEvent* event);
     virtual void contextMenuEvent(QContextMenuEvent* event);

+    virtual void wheelEvent(QWheelEvent* event);

 
 private slots:
     /**
 
 private slots:
     /**