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,13 +101,17 @@ Item {
room: currentRoom room: currentRoom
} }
delegate: MessageDelegate {} delegate: Column {
width: parent.width
spacing: 8
section.property: "section" RowLayout {
section.criteria: ViewSection.FullString readonly property bool sectionVisible: section !== aboveSection
section.delegate: RowLayout {
width: parent.width * 0.6 width: parent.width * 0.8
anchors.right: parent.right visible: sectionVisible
anchors.horizontalCenter: parent.horizontalCenter
spacing: 8
Rectangle { Rectangle {
Layout.fillWidth: true Layout.fillWidth: true
@ -116,11 +120,19 @@ Item {
} }
Label { Label {
padding: 4
text: section text: section
color: Material.accent color: Material.accent
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
} }
Rectangle {
Layout.fillWidth: true
height:2
color: Material.accent
}
}
MessageDelegate {}
} }
ScrollBar.vertical: messageListViewScrollBar ScrollBar.vertical: messageListViewScrollBar

View File

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