From 583fd9b5ab17087af3dc984f897ec5c5e467db14 Mon Sep 17 00:00:00 2001
From: Nicolas Werner <nicolas.werner@hotmail.de>
Date: Sat, 27 Mar 2021 01:17:58 +0100
Subject: [PATCH] Fix double click on video message
---
.../qml/delegates/PlayableMediaMessage.qml | 68 ++++++++-----------
1 file changed, 30 insertions(+), 38 deletions(-)
diff --git a/resources/qml/delegates/PlayableMediaMessage.qml b/resources/qml/delegates/PlayableMediaMessage.qml
index 522778959..321f7d61d 100644
--- a/resources/qml/delegates/PlayableMediaMessage.qml
+++ b/resources/qml/delegates/PlayableMediaMessage.qml
@@ -2,6 +2,7 @@
//
// SPDX-License-Identifier: GPL-3.0-or-later
+import "../"
import QtMultimedia 5.6
import QtQuick 2.12
import QtQuick.Controls 2.1
@@ -107,20 +108,40 @@ Rectangle {
width: parent.width
spacing: 15
- Rectangle {
+ ImageButton {
id: button
- color: colors.window
- radius: 22
- height: 44
- width: 44
+ Layout.alignment: Qt.verticalCenter
+ //color: colors.window
+ //radius: 22
+ height: 32
+ width: 32
+ z: 3
+ image: ":/icons/icons/ui/arrow-pointing-down.png"
+ onClicked: {
+ switch (button.state) {
+ case "":
+ TimelineManager.timeline.cacheMedia(model.data.id);
+ break;
+ case "stopped":
+ media.play();
+ console.log("play");
+ button.state = "playing";
+ break;
+ case "playing":
+ media.pause();
+ console.log("pause");
+ button.state = "stopped";
+ break;
+ }
+ }
states: [
State {
name: "stopped"
PropertyChanges {
- target: img
- source: "image://colorimage/:/icons/icons/ui/play-sign.png?" + colors.text
+ target: button
+ image: ":/icons/icons/ui/play-sign.png"
}
},
@@ -128,42 +149,13 @@ Rectangle {
name: "playing"
PropertyChanges {
- target: img
- source: "image://colorimage/:/icons/icons/ui/pause-symbol.png?" + colors.text
+ target: button
+ image: ":/icons/icons/ui/pause-symbol.png"
}
}
]
- Image {
- id: img
-
- anchors.centerIn: parent
- z: 3
- source: "image://colorimage/:/icons/icons/ui/arrow-pointing-down.png?" + colors.text
- fillMode: Image.Pad
- }
-
- TapHandler {
- onSingleTapped: {
- switch (button.state) {
- case "":
- TimelineManager.timeline.cacheMedia(model.data.id);
- break;
- case "stopped":
- media.play();
- console.log("play");
- button.state = "playing";
- break;
- case "playing":
- media.pause();
- console.log("pause");
- button.state = "stopped";
- break;
- }
- }
- }
-
CursorShape {
anchors.fill: parent
cursorShape: Qt.PointingHandCursor
--
GitLab