ESCA111/neochat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into kirigami2

Browse Source
This commit is contained in:
Carl Schwan
2020-10-03 17:48:27 +02:00
parent ccece5112f d6009479a5
commit 2532a86e7e
19 changed files with 74 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
imports/Spectral/Component/AutoTextField.qml
View File

@@ -26,7 +26,7 @@ TextField {
states: [
State {
name: "shown"
when: textField.text.length !== 0 || textField.activeFocus
when: textField.text.length != 0 || textField.activeFocus
PropertyChanges { target: floatingPlaceholder; scale: 0.8 }
PropertyChanges { target: floatingPlaceholder; anchors.topMargin: -floatingPlaceholder.height * 0.4 }
}

8
imports/Spectral/Component/Timeline/AudioDelegate.qml
View File

@@ -96,7 +96,7 @@ RowLayout {
}
Label {
readonly property int duration: content.info.duration || audio.duration || 0
readonly property int duration: content.info.duration ?? audio.duration ?? 0
Layout.fillWidth: true
@@ -193,14 +193,12 @@ RowLayout {
}
}
function openSavedFile()
{
function openSavedFile() {
if (Qt.openUrlExternally(progressInfo.localPath)) return;
if (Qt.openUrlExternally(progressInfo.localDir)) return;
}
function humanSize(duration)
{
function humanSize(duration) {
if (!duration)
return qsTr("Unknown", "Unknown duration")
if (duration < 1000)

10
imports/Spectral/Component/Timeline/MessageDelegate.qml
View File

@@ -12,8 +12,14 @@ RowLayout {
default property alias innerObject : column.children
readonly property bool sentByMe: author.isLocalUser
readonly property bool replyVisible: reply || false
readonly property bool failed: marks === EventStatus.SendingFailed
readonly property bool darkBackground: !sentByMe
readonly property bool replyVisible: reply ?? false
readonly property bool failed: marks == EventStatus.SendingFailed
readonly property color authorColor: eventType == "notice" ? MPalette.primary : author.color
readonly property color replyAuthorColor: replyVisible ? reply.author.color : MPalette.accent
signal saveFileAs()
signal openExternally()
id: root

2
imports/Spectral/Component/Timeline/ReactionDelegate.qml
View File

@@ -4,7 +4,7 @@ import QtQuick.Layouts 1.12
import Spectral.Setting 0.1
Flow {
visible: (reaction && reaction.length > 0) || false
visible: (reaction && reaction.length > 0) ?? false
spacing: 8

2
imports/Spectral/Component/Timeline/VideoDelegate.qml
View File

@@ -120,7 +120,7 @@ RowLayout {
}
Image {
readonly property bool isThumbnail: !(content.info.thumbnail_info == null || content.thumbnailMediaId == null)
readonly property bool isThumbnail: content.info.thumbnail_info && content.thumbnailMediaId
readonly property var info: isThumbnail ? content.info.thumbnail_info : content.info
anchors.fill: parent