q5sys review:

- Menu > View > reword last entry to "Fit to Window"
- Double Click : Toggle between Normal size and Fit Graphics View
- Scroll Wheel : zoom in = down / zoom out = up
- Ctrl + Scroll Wheel : next image = down / previous image = up

1 files changed, 51 insertions, 0 deletions

diff --git a/src-qt5/desktop-utils/lumina-photo/PhotoView.cpp b/src-qt5/desktop-utils/lumina-photo/PhotoView.cpp
index def476b5..718edf99 100644
--- a/src-qt5/desktop-utils/lumina-photo/PhotoView.cpp
+++ b/src-qt5/desktop-utils/lumina-photo/PhotoView.cpp
@@ -1,5 +1,7 @@
 
 #include "PhotoView.h"
+#include <QDebug>
+#include <QWheelEvent>
 
 PhotoView::PhotoView (QWidget *parent) : QGraphicsView (parent)
 {
@@ -12,19 +14,68 @@ PhotoView::PhotoView (QWidget *parent) : QGraphicsView (parent)
 void PhotoView::zoomIn ()
 {
     scale (scaleFactor, scaleFactor);
+    isFit = false;
 }
 
 void PhotoView::zoomOut ()
 {
     scale (invScaleFactor, invScaleFactor);
+    isFit = false;
 }
 
 void PhotoView::zoomNormal ()
 {
     resetMatrix ();
+    isFit = false;
 }
 
 void PhotoView::zoomFit ()
 {
     fitInView (sceneRect (), Qt::KeepAspectRatio);
+    isFit = true;
+}
+
+bool PhotoView::eventFilter (QObject *, QEvent *event)
+{
+    if (event->type () == QEvent::Wheel)
+    {
+        QWheelEvent *wheel_event = static_cast<QWheelEvent *> (event);
+        if (wheel_event->delta () > 0)
+        {
+            if (wheel_event->modifiers () == Qt::ControlModifier)
+            {
+                emit nextImage ();
+            }
+            else
+            {
+                scale (scaleFactor, scaleFactor);
+                return true;
+            }
+        }
+        else if (wheel_event->delta () < 0)
+        {
+            if (wheel_event->modifiers () == Qt::ControlModifier)
+            {
+                emit prevImage ();
+            }
+            else
+            {
+                scale (invScaleFactor, invScaleFactor);
+                return true;
+            }
+        }
+    }
+
+    return false;
+}
+
+void PhotoView::mouseDoubleClickEvent (QMouseEvent *event)
+{
+    if (event->button () == Qt::LeftButton)
+    {
+        if (isFit)
+            zoomNormal ();
+        else
+            zoomFit ();
+    }
 }