Add minimum scale in image viewer

2 files changed, 33 insertions, 2 deletions

diff --git a/resources/qml/dialogs/ImageOverlay.qml b/resources/qml/dialogs/ImageOverlay.qml

index 246a0bab..d7ea7b0e 100644
--- a/resources/qml/dialogs/ImageOverlay.qml
+++ b/resources/qml/dialogs/ImageOverlay.qml
@@ -4,6 +4,7 @@
 
 import QtQuick 2.15
 import QtQuick.Window 2.15
+import Qt.labs.animation 1.0
 
 import ".."
 
@@ -55,14 +56,46 @@ Window {
             eventId: imageOverlay.eventId
         }
 
+        BoundaryRule on scale {
+            enabled: img.loaded
+            id: sbr
+            minimum: 0.1
+            maximum: 100
+            minimumOvershoot: 0.02; maximumOvershoot: 100
+        }
+
+        //BoundaryRule on x {
+        //    enabled: img.loaded
+        //    id: xbr
+        //    minimum: -100
+        //    maximum: imageOverlay.width - img.width + 100
+        //    minimumOvershoot: 100; maximumOvershoot: 100
+        //    overshootFilter: BoundaryRule.Peak
+        //}
+
+        //BoundaryRule on y {
+        //    enabled: img.loaded
+        //    id: ybr
+        //    minimum: -100
+        //    maximum: imageOverlay.height - img.height + 100
+        //    minimumOvershoot: 100; maximumOvershoot: 100
+        //    overshootFilter: BoundaryRule.Peak
+        //}
+
         PinchHandler {
+            onActiveChanged: if (!active) sbr.returnToBounds();
         }
 
         WheelHandler {
             property: "scale"
+            onActiveChanged: if (!active) sbr.returnToBounds();
         }
 
         DragHandler {
+            //onActiveChanged: if (!active) {
+            //    xbr.returnToBounds();
+            //    ybr.returnToBounds();
+            //}
         }
 
         HoverHandler {
diff --git a/src/ui/MxcAnimatedImage.cpp b/src/ui/MxcAnimatedImage.cpp

index 83787fff..b8e707bb 100644
--- a/src/ui/MxcAnimatedImage.cpp
+++ b/src/ui/MxcAnimatedImage.cpp
@@ -20,12 +20,10 @@
 void
 MxcAnimatedImage::startDownload()
 {
-    nhlog::ui()->debug("START DOWNLOAD!!!");
     if (!room_)
         return;
     if (eventId_.isEmpty())
         return;
-    nhlog::ui()->debug("START DOWNLOAD2!!!");
 
     auto event = room_->eventById(eventId_);
     if (!event) {