d3v1l/matrixion
1
0
Fork 0
mirror of https://github.com/Nheko-Reborn/nheko.git synced 2024-11-25 20:48:52 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add minimum scale in image viewer

Browse source
This commit is contained in:
Nicolas Werner 2022-01-02 23:50:08 +01:00
parent f14f978c48
commit 6d4ff70b48
No known key found for this signature in database
GPG key ID: C8D75E610773F2D9
2 changed files with 33 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
resources/qml/dialogs/ImageOverlay.qml
View file

@ -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 {

2
src/ui/MxcAnimatedImage.cpp
View file

@ -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) {