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

Remove boundary handling in image overlay

Browse source 
They hurt more than they are helping
This commit is contained in:
Nicolas Werner 2022-04-10 04:10:32 +02:00
parent 557e60990d
commit 85f0ffb6bf
2 changed files with 28 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
resources/qml/Root.qml
View file

@ -288,7 +288,9 @@ Pane {
var dialog = imageOverlay.createObject(timelineRoot, {
"room": room,
"eventId": eventId,
"url": url
"url": url,
"originalWidth": originalWidth ?? 0,
"proportionalHeight": proportionalHeight ?? 0
});
dialog.showFullScreen();
destroyOnClose(dialog);

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

@ -4,7 +4,6 @@
import QtQuick 2.15
import QtQuick.Window 2.15
import Qt.labs.animation 1.0
import ".."
@ -16,10 +15,12 @@ Window {
required property string url
required property string eventId
required property Room room
required property int originalWidth
required property double proportionalHeight
flags: Qt.FramelessWindowHint
visibility: Window.FullScreen
//visibility: Window.FullScreen
color: Qt.rgba(0.2,0.2,0.2,0.66)
Shortcut {
@ -28,11 +29,18 @@ Window {
}
Item {
height: Math.min(parent.height, img.implicitHeight)
width: Math.min(parent.width, img.implicitWidth)
x: (parent.width - img.width)/2
y: (parent.height - img.height)/2
id: imgContainer
property int imgSrcWidth: (originalWidth && originalWidth > 200) ? originalWidth : Screen.width
property int imgSrcHeight: proportionalHeight ? imgSrcWidth * proportionalHeight : Screen.height
height: Math.min(parent.height, imgSrcHeight)
width: Math.min(parent.width, imgSrcWidth)
x: (parent.width - width)
y: (parent.height - height)
Image {
id: img
@ -57,46 +65,29 @@ Window {
eventId: imageOverlay.eventId
}
BoundaryRule on scale {
enabled: img.loaded || mxcimage.loaded
id: sbr
minimum: 0.1
maximum: 10
minimumOvershoot: 0.02; maximumOvershoot: 10.02
onScaleChanged: {
if (scale > 10) scale = 10;
if (scale < 0.1) scale = 0.1
}
}
BoundaryRule on x {
enabled: img.loaded || mxcimage.loaded
id: xbr
minimum: -100
maximum: imageOverlay.width - img.width + 100
minimumOvershoot: 100; maximumOvershoot: 100
overshootFilter: BoundaryRule.Peak
}
Item {
anchors.fill: parent
BoundaryRule on y {
enabled: img.loaded || mxcimage.loaded
id: ybr
minimum: -100
maximum: imageOverlay.height - img.height + 100
minimumOvershoot: 100; maximumOvershoot: 100
overshootFilter: BoundaryRule.Peak
}
PinchHandler {
onActiveChanged: if (!active) sbr.returnToBounds();
target: imgContainer
maximumScale: 10
minimumScale: 0.1
}
WheelHandler {
property: "scale"
onActiveChanged: if (!active) sbr.returnToBounds();
target: imgContainer
}
DragHandler {
onActiveChanged: if (!active) {
xbr.returnToBounds();
ybr.returnToBounds();
}
target: imgContainer
}
HoverHandler {