diff options
Diffstat (limited to 'resources/qml/delegates')
| -rw-r--r-- | resources/qml/delegates/MessageDelegate.qml | 10 | ||||
| -rw-r--r-- | resources/qml/delegates/Pill.qml (renamed from resources/qml/delegates/Redacted.qml) | 1 | ||||
| -rw-r--r-- | resources/qml/delegates/PlayableMediaMessage.qml | 2 |
3 files changed, 10 insertions, 3 deletions
diff --git a/resources/qml/delegates/MessageDelegate.qml b/resources/qml/delegates/MessageDelegate.qml index 49209f68..e31321f9 100644 --- a/resources/qml/delegates/MessageDelegate.qml +++ b/resources/qml/delegates/MessageDelegate.qml @@ -39,7 +39,15 @@ DelegateChooser { } DelegateChoice { roleValue: MtxEvent.Redacted - Redacted {} + Pill { + text: qsTr("redacted") + } + } + DelegateChoice { + roleValue: MtxEvent.Encryption + Pill { + text: qsTr("Encryption enabled") + } } DelegateChoice { Placeholder {} diff --git a/resources/qml/delegates/Redacted.qml b/resources/qml/delegates/Pill.qml index 42fb4835..53a9684e 100644 --- a/resources/qml/delegates/Redacted.qml +++ b/resources/qml/delegates/Pill.qml @@ -2,7 +2,6 @@ import QtQuick 2.5 import QtQuick.Controls 2.1 Label { - text: qsTr("redacted") color: inactiveColors.text horizontalAlignment: Text.AlignHCenter diff --git a/resources/qml/delegates/PlayableMediaMessage.qml b/resources/qml/delegates/PlayableMediaMessage.qml index 68b09f7b..1207ac77 100644 --- a/resources/qml/delegates/PlayableMediaMessage.qml +++ b/resources/qml/delegates/PlayableMediaMessage.qml @@ -20,7 +20,7 @@ Rectangle { Rectangle { id: videoContainer visible: model.type == MtxEvent.VideoMessage - width: Math.min(parent.width, model.width) + width: Math.min(parent.width, model.width ? model.width : 400) // some media has 0 as size... height: width*model.proportionalHeight Image { anchors.fill: parent |