Skip to content
Snippets Groups Projects
Verified Commit 6d4ff70b authored by Nicolas Werner's avatar Nicolas Werner
Browse files

Add minimum scale in image viewer

parent f14f978c
No related branches found
No related tags found
No related merge requests found
Pipeline #2470 passed
......@@ -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 {
......
......@@ -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) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment