From 435047b1baeb9a6fa33034f855393c0064f69b2c Mon Sep 17 00:00:00 2001
From: Nicolas Werner <nicolas.werner@hotmail.de>
Date: Thu, 11 Nov 2021 19:56:51 +0100
Subject: [PATCH] Make it possible to unhide the controls on mobile
---
.../qml/delegates/PlayableMediaMessage.qml | 6 ++++
resources/qml/ui/media/MediaControls.qml | 34 ++++++++-----------
2 files changed, 21 insertions(+), 19 deletions(-)
diff --git a/resources/qml/delegates/PlayableMediaMessage.qml b/resources/qml/delegates/PlayableMediaMessage.qml
index 67214dd70..99c82a9b2 100644
--- a/resources/qml/delegates/PlayableMediaMessage.qml
+++ b/resources/qml/delegates/PlayableMediaMessage.qml
@@ -48,6 +48,12 @@ Item {
width: parent.width
height: parent.height - fileInfoLabel.height
+
+ TapHandler {
+ onTapped: mediaControls.showControls();
+ }
+
+
Image {
anchors.fill: parent
diff --git a/resources/qml/ui/media/MediaControls.qml b/resources/qml/ui/media/MediaControls.qml
index f5321dca6..00ccdd268 100644
--- a/resources/qml/ui/media/MediaControls.qml
+++ b/resources/qml/ui/media/MediaControls.qml
@@ -21,16 +21,21 @@ Rectangle {
property var duration
property var positionValue: 0
property var position
- property bool shouldShowControls: !playingVideo || playerMouseArea.shouldShowControls || volumeSlider.controlsVisible
+ property bool shouldShowControls: !playingVideo || playerMouseArea.shouldShowControls || volumeSlider.state == "shown"
color: {
var wc = Nheko.colors.alternateBase;
return Qt.rgba(wc.r, wc.g, wc.b, 0.5);
}
+ opacity: control.shouldShowControls ? 1 : 0
height: controlLayout.implicitHeight
signal playPauseActivated()
signal loadActivated()
+ function showControls() {
+ controlHideTimer.restart();
+ }
+
function durationToString(duration) {
function maybeZeroPrepend(time) {
return (time < 10) ? "0" + time.toString() : time.toString();
@@ -50,26 +55,18 @@ Rectangle {
return hh + ":" + mm + ":" + ss;
}
- MouseArea {
+ HoverHandler {
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: {
- control.mediaLoaded ? control.playPauseActivated() : control.loadActivated();
- }
- hoverEnabled: true
- onPositionChanged: controlHideTimer.start()
- onExited: controlHideTimer.start()
- onEntered: controlHideTimer.start()
- anchors.fill: control
- propagateComposedEvents: true
+ onHoveredChanged: showControls();
}
ColumnLayout {
id: controlLayout
- opacity: control.shouldShowControls ? 1 : 0
+ enabled: control.shouldShowControls
spacing: 0
anchors.bottom: control.bottom
@@ -219,13 +216,12 @@ Rectangle {
}
+ }
- // Fade controls in/out
- Behavior on opacity {
- OpacityAnimator {
- duration: 100
- }
-
+ // Fade controls in/out
+ Behavior on opacity {
+ OpacityAnimator {
+ duration: 100
}
}
--
GitLab