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

5
imports/Spectral/Panel/RoomListPanel.qml
View File

@@ -108,11 +108,6 @@ Kirigami.ScrollablePage {
Layout.fillWidth: true
Layout.fillHeight: true
text: name || "No Name"
font.pixelSize: 16
font.bold: unreadCount >= 0
elide: Text.ElideRight
wrapMode: Text.NoWrap
}
Controls.Label {

8
imports/Spectral/Panel/RoomPanelInput.qml
View File

@@ -130,9 +130,9 @@ Control {
keyNavigationWraps: true
delegate: Control {
property string autoCompleteText: modelData.displayName || modelData.unicode
property string autoCompleteText: modelData.displayName ?? modelData.unicode
property bool isEmoji: modelData.unicode != null
readonly property bool highlighted: autoCompleteListView.currentIndex === index
readonly property bool highlighted: autoCompleteListView.currentIndex == index
height: 36
padding: 6
@@ -140,7 +140,7 @@ Control {
background: Rectangle {
visible: !isEmoji
color: highlighted ? border.color : "transparent"
border.color: isEmoji ? Material.accent : modelData.color
border.color: isEmoji ? MPalette.accent : modelData.color
border.width: 2
radius: height / 2
}
@@ -164,7 +164,7 @@ Control {
Layout.preferredHeight: 24
visible: !isEmoji
source: modelData.avatarMediaId || null
source: modelData.avatarMediaId ?? null
color: modelData.color ? Qt.darker(modelData.color, 1.1) : MPalette.accent
}