Merge branch 'dev'

This commit is contained in:
Black Hat 2018-08-05 14:37:23 +08:00
commit cfa7049c5e
2 changed files with 29 additions and 16 deletions

View File

@ -101,26 +101,38 @@ Item {
room: currentRoom
}
delegate: MessageDelegate {}
delegate: Column {
width: parent.width
spacing: 8
section.property: "section"
section.criteria: ViewSection.FullString
section.delegate: RowLayout {
width: parent.width * 0.6
anchors.right: parent.right
RowLayout {
readonly property bool sectionVisible: section !== aboveSection
Rectangle {
Layout.fillWidth: true
height:2
color: Material.accent
width: parent.width * 0.8
visible: sectionVisible
anchors.horizontalCenter: parent.horizontalCenter
spacing: 8
Rectangle {
Layout.fillWidth: true
height:2
color: Material.accent
}
Label {
text: section
color: Material.accent
verticalAlignment: Text.AlignVCenter
}
Rectangle {
Layout.fillWidth: true
height:2
color: Material.accent
}
}
Label {
padding: 4
text: section
color: Material.accent
verticalAlignment: Text.AlignVCenter
}
MessageDelegate {}
}
ScrollBar.vertical: messageListViewScrollBar

View File

@ -31,6 +31,7 @@ Item {
id: searchField
width: parent.width
height: 36
color: "black"
leftPadding: mini ? 4 : 16
topPadding: 0
bottomPadding: 0