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

Make it possible to unhide the controls on mobile

Browse source
This commit is contained in:
Nicolas Werner 2021-11-11 19:56:51 +01:00
parent ffc60180de
commit 435047b1ba
No known key found for this signature in database
GPG key ID: C8D75E610773F2D9
2 changed files with 21 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
resources/qml/delegates/PlayableMediaMessage.qml
View file

@ -49,6 +49,12 @@ Item {
height: parent.height - fileInfoLabel.height height: parent.height - fileInfoLabel.height
TapHandler {
onTapped: mediaControls.showControls();
}
Image { Image {
anchors.fill: parent anchors.fill: parent
source: thumbnailUrl.replace("mxc://", "image://MxcImage/") source: thumbnailUrl.replace("mxc://", "image://MxcImage/")

34
resources/qml/ui/media/MediaControls.qml
View file

@ -21,16 +21,21 @@ Rectangle {
property var duration property var duration
property var positionValue: 0 property var positionValue: 0
property var position property var position
property bool shouldShowControls: !playingVideo || playerMouseArea.shouldShowControls || volumeSlider.controlsVisible property bool shouldShowControls: !playingVideo || playerMouseArea.shouldShowControls || volumeSlider.state == "shown"
color: { color: {
var wc = Nheko.colors.alternateBase; var wc = Nheko.colors.alternateBase;
return Qt.rgba(wc.r, wc.g, wc.b, 0.5); return Qt.rgba(wc.r, wc.g, wc.b, 0.5);
} }
opacity: control.shouldShowControls ? 1 : 0
height: controlLayout.implicitHeight height: controlLayout.implicitHeight
signal playPauseActivated() signal playPauseActivated()
signal loadActivated() signal loadActivated()
function showControls() {
controlHideTimer.restart();
}
function durationToString(duration) { function durationToString(duration) {
function maybeZeroPrepend(time) { function maybeZeroPrepend(time) {
return (time < 10) ? "0" + time.toString() : time.toString(); return (time < 10) ? "0" + time.toString() : time.toString();
@ -50,26 +55,18 @@ Rectangle {
return hh + ":" + mm + ":" + ss; return hh + ":" + mm + ":" + ss;
} }
MouseArea { HoverHandler {
id: playerMouseArea id: playerMouseArea
property bool shouldShowControls: (containsMouse && controlHideTimer.running) || (control.mediaState != MediaPlayer.PlayingState) || controlLayout.contains(mapToItem(controlLayout, mouseX, mouseY)) property bool shouldShowControls: hovered || controlHideTimer.running || control.mediaState != MediaPlayer.PlayingState
onClicked: { onHoveredChanged: showControls();
control.mediaLoaded ? control.playPauseActivated() : control.loadActivated();
}
hoverEnabled: true
onPositionChanged: controlHideTimer.start()
onExited: controlHideTimer.start()
onEntered: controlHideTimer.start()
anchors.fill: control
propagateComposedEvents: true
} }
ColumnLayout { ColumnLayout {
id: controlLayout id: controlLayout
opacity: control.shouldShowControls ? 1 : 0 enabled: control.shouldShowControls
spacing: 0 spacing: 0
anchors.bottom: control.bottom anchors.bottom: control.bottom
@ -219,13 +216,12 @@ Rectangle {
} }
}
// Fade controls in/out // Fade controls in/out
Behavior on opacity { Behavior on opacity {
OpacityAnimator { OpacityAnimator {
duration: 100 duration: 100
}
} }
} }