mirror
/
nheko
mirror of https://github.com/Nheko-Reborn/nheko
2
0
Fork 1
Code Issues Releases Wiki Activity

Merge pull request #1374 from Nheko-Reborn/private_images

Browse Source 
Blur images properly
pull/1389/head
DeepBlueV7.X 2 years ago committed by GitHub
parent b4a7f34711 5abd2df9b4
commit 4372742bc1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 105 additions and 40 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 3
      resources/qml/ChatPage.qml
  2. 29
      resources/qml/PrivacyScreen.qml
  3. 8
      resources/qml/RoomList.qml
  4. 1
      resources/qml/TimelineView.qml
  5. 104
      resources/qml/delegates/ImageMessage.qml

3
resources/qml/ChatPage.qml
Unescape View File

@ -126,6 +126,7 @@ Rectangle {
TimelineView {
id: timeline
privacyScreen: privacyScreen
showBackButton: adaptiveView.singlePageMode
room: Rooms.currentRoom
roomPreview: Rooms.currentRoomPreview.roomid ? Rooms.currentRoomPreview : null
@ -138,6 +139,8 @@ Rectangle {
}
PrivacyScreen {
id: privacyScreen
anchors.fill: parent
visible: Settings.privacyScreen
screenTimeout: Settings.privacyScreenTimeout

29
resources/qml/PrivacyScreen.qml
Unescape View File

@ -10,6 +10,7 @@ import im.nheko 1.0
Item {
id: privacyScreen
readonly property bool active: Settings.privacyScreen && screenSaver.state === "Visible"
property var timelineRoot
property int screenTimeout
@ -59,7 +60,6 @@ Item {
target: screenSaver
opacity: 1
}
},
State {
name: "Invisible"
@ -73,34 +73,13 @@ Item {
target: screenSaver
visible: false
}
}
]
transitions: [
Transition {
from: "Visible"
to: "Invisible"
SequentialAnimation {
NumberAnimation {
target: screenSaver
property: "opacity"
duration: 250
easing.type: Easing.InQuad
}
NumberAnimation {
target: screenSaver
property: "visible"
duration: 0
}
}
},
Transition {
from: "Invisible"
to: "Visible"
reversible: true
SequentialAnimation {
NumberAnimation {
@ -112,8 +91,8 @@ Item {
NumberAnimation {
target: screenSaver
property: "opacity"
duration: 500
easing.type: Easing.InQuad
duration: 300
easing.type: Easing.Linear
}
}

8
resources/qml/RoomList.qml
Unescape View File

@ -108,17 +108,21 @@ Page {
}
TimelineView {
id: timelineView
id: timeline
privacyScreen: privacyScreen
anchors.fill: parent
room: roomWindowW.room
roomPreview: roomWindowW.roomPreview.roomid ? roomWindowW.roomPreview : null
}
PrivacyScreen {
id: privacyScreen
anchors.fill: parent
visible: Settings.privacyScreen
screenTimeout: Settings.privacyScreenTimeout
timelineRoot: timelineView
timelineRoot: timeline
windowTarget: roomWindowW
}

1
resources/qml/TimelineView.qml
Unescape View File

@ -24,6 +24,7 @@ Item {
property var roomPreview: null
property bool showBackButton: false
property bool shouldEffectsRun: false
required property PrivacyScreen privacyScreen
clip: true
onRoomChanged: if (room != null) room.triggerSpecialEffects()

104
resources/qml/delegates/ImageMessage.qml
Unescape View File

@ -26,21 +26,88 @@ AbstractButton {
height: width*proportionalHeight
hoverEnabled: true
state: (img.status != Image.Ready || timeline.privacyScreen.active) ? "BlurhashVisible" : "ImageVisible"
states: [
State {
name: "BlurhashVisible"
PropertyChanges {
target: blurhash_
opacity: (img.status != Image.Ready) || (timeline.privacyScreen.active && blurhash) ? 1 : 0
visible: (img.status != Image.Ready) || (timeline.privacyScreen.active && blurhash)
}
PropertyChanges {
target: img
opacity: 0
}
PropertyChanges {
target: mxcimage
opacity: 0
}
},
State {
name: "ImageVisible"
PropertyChanges {
target: blurhash_
opacity: 0
visible: false
}
PropertyChanges {
target: img
opacity: 1
}
PropertyChanges {
target: mxcimage
opacity: 1
}
}
]
transitions: [
Transition {
from: "ImageVisible"
to: "BlurhashVisible"
reversible: true
SequentialAnimation {
PropertyAction {
target: blurhash_
property: "visible"
}
ParallelAnimation {
NumberAnimation {
target: blurhash_
property: "opacity"
duration: 300
easing.type: Easing.Linear
}
NumberAnimation {
target: img
property: "opacity"
duration: 300
easing.type: Easing.Linear
}
NumberAnimation {
target: mxcimage
property: "opacity"
duration: 300
easing.type: Easing.Linear
}
}
}
}
]
property int metadataWidth
property bool fitsMetadata: (parent.width - width) > metadataWidth+4
Image {
id: blurhash_
anchors.fill: parent
visible: img.status != Image.Ready
source: blurhash ? ("image://blurhash/" + blurhash) : ("image://colorimage/:/icons/icons/ui/image-failed.svg?" + Nheko.colors.buttonText)
asynchronous: true
fillMode: Image.PreserveAspectFit
sourceSize.width: parent.width * Screen.devicePixelRatio
sourceSize.height: parent.height * Screen.devicePixelRatio
}
Image {
id: img
@ -66,7 +133,18 @@ AbstractButton {
eventId: parent.eventId
}
onClicked :Settings.openImageExternal ? room.openMedia(eventId) : TimelineManager.openImageOverlay(room, url, eventId, originalWidth, proportionalHeight);
Image {
id: blurhash_
anchors.fill: parent
source: blurhash ? ("image://blurhash/" + blurhash) : ("image://colorimage/:/icons/icons/ui/image-failed.svg?" + Nheko.colors.buttonText)
asynchronous: true
fillMode: Image.PreserveAspectFit
sourceSize.width: parent.width * Screen.devicePixelRatio
sourceSize.height: parent.height * Screen.devicePixelRatio
}
onClicked: Settings.openImageExternal ? room.openMedia(eventId) : TimelineManager.openImageOverlay(room, url, eventId, originalWidth, proportionalHeight);
Item {
id: overlay

Write Preview
Loading…
Cancel
Save