Original Size toggle mode enhancement

jdpurcell · Jul 13, 2024 · 24401fa · 24401fa
1 parent 2ad29d8
commit 24401fa
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/qvgraphicsview.cpp b/src/qvgraphicsview.cpp
@@ -499,7 +499,7 @@ void QVGraphicsView::postLoad()
     if (!loadIsFromSessionRestore)
     {
         if (navigationResetsZoom && calculatedZoomMode != defaultCalculatedZoomMode)
-            setCalculatedZoomMode(defaultCalculatedZoomMode);
+            setCalculatedZoomMode(defaultCalculatedZoomMode, true);
         else
             fitOrConstrainImage();
     }
@@ -602,7 +602,7 @@ const std::optional<Qv::CalculatedZoomMode> &QVGraphicsView::getCalculatedZoomMo
     return calculatedZoomMode;
 }
 
-void QVGraphicsView::setCalculatedZoomMode(const std::optional<Qv::CalculatedZoomMode> &value)
+void QVGraphicsView::setCalculatedZoomMode(const std::optional<Qv::CalculatedZoomMode> &value, const bool isNavigating)
 {
     if (calculatedZoomMode == value)
     {
@@ -611,9 +611,9 @@ void QVGraphicsView::setCalculatedZoomMode(const std::optional<Qv::CalculatedZoo
         return;
     }
 
-    if (value == Qv::CalculatedZoomMode::OriginalSize && zoomLevel == 1 && defaultCalculatedZoomMode != Qv::CalculatedZoomMode::OriginalSize && qvApp->getSettingsManager().getBoolean("originalsizeastoggle"))
+    if (value == Qv::CalculatedZoomMode::OriginalSize && zoomLevel == 1 && !isNavigating && qvApp->getSettingsManager().getBoolean("originalsizeastoggle"))
     {
-        setCalculatedZoomMode(defaultCalculatedZoomMode);
+        setCalculatedZoomMode(defaultCalculatedZoomMode != Qv::CalculatedZoomMode::OriginalSize ? defaultCalculatedZoomMode : Qv::CalculatedZoomMode::ZoomToFit);
         return;
     }
 

diff --git a/src/qvgraphicsview.h b/src/qvgraphicsview.h
@@ -54,7 +54,7 @@ class QVGraphicsView : public QGraphicsView
     void zoomAbsolute(const qreal absoluteLevel, const std::optional<QPoint> &mousePos = {}, const bool isApplyingCalculation = false);
 
     const std::optional<Qv::CalculatedZoomMode> &getCalculatedZoomMode() const;
-    void setCalculatedZoomMode(const std::optional<Qv::CalculatedZoomMode> &value);
+    void setCalculatedZoomMode(const std::optional<Qv::CalculatedZoomMode> &value, const bool isNavigating = false);
 
     bool getNavigationResetsZoom() const;
     void setNavigationResetsZoom(const bool value);