Merge branch 'dev'
This commit is contained in:
commit
cfa7049c5e
|
@ -101,13 +101,17 @@ 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
|
||||
|
||||
width: parent.width * 0.8
|
||||
visible: sectionVisible
|
||||
anchors.horizontalCenter: parent.horizontalCenter
|
||||
spacing: 8
|
||||
|
||||
Rectangle {
|
||||
Layout.fillWidth: true
|
||||
|
@ -116,11 +120,19 @@ Item {
|
|||
}
|
||||
|
||||
Label {
|
||||
padding: 4
|
||||
text: section
|
||||
color: Material.accent
|
||||
verticalAlignment: Text.AlignVCenter
|
||||
}
|
||||
|
||||
Rectangle {
|
||||
Layout.fillWidth: true
|
||||
height:2
|
||||
color: Material.accent
|
||||
}
|
||||
}
|
||||
|
||||
MessageDelegate {}
|
||||
}
|
||||
|
||||
ScrollBar.vertical: messageListViewScrollBar
|
||||
|
|
|
@ -31,6 +31,7 @@ Item {
|
|||
id: searchField
|
||||
width: parent.width
|
||||
height: 36
|
||||
color: "black"
|
||||
leftPadding: mini ? 4 : 16
|
||||
topPadding: 0
|
||||
bottomPadding: 0
|
||||
|
|
Loading…
Reference in New Issue