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

Change black to primary.

Browse Source 
Improvements on ImageDelegate.
Change reply style.
This commit is contained in:
Black Hat
2019-04-22 09:28:33 +08:00
parent a86c9de17b
commit dda8738e8c
7 changed files with 48 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
imports/Spectral/Panel/RoomDrawer.qml
View File

@@ -4,6 +4,7 @@ import QtQuick.Controls.Material 2.12
import QtQuick.Layouts 1.12
import Spectral.Component 2.0
import Spectral.Effect 2.0
import Spectral.Setting 0.1
import Spectral 0.1
@@ -68,7 +69,7 @@ Drawer {
Layout.preferredHeight: 32
Layout.alignment: Qt.AlignTop
icon: "\ue88e"
icon: "\ue88f"
color: MPalette.lighter
}
@@ -96,7 +97,7 @@ Drawer {
wrapMode: Label.Wrap
text: room && room.topic ? room.topic : "No Topic"
color: MPalette.accent
color: MPalette.foreground
}
Label {
@@ -161,7 +162,7 @@ Drawer {
room: roomDrawer.room
}
delegate: SwipeDelegate {
delegate: Item {
width: userListView.width
height: 48
@@ -185,25 +186,9 @@ Drawer {
}
}
swipe.right: Rectangle {
width: height
height: parent.height
anchors.right: parent.right
color: Material.accent
MaterialIcon {
anchors.fill: parent
icon: "\ue879"
color: "white"
}
SwipeDelegate.onClicked: {
room.kickMember(userId)
swipe.close()
}
RippleEffect {
anchors.fill: parent
}
onClicked: swipe.open(SwipeDelegate.Right)
}
ScrollBar.vertical: ScrollBar {}

61
imports/Spectral/Panel/RoomPanel.qml
View File

@@ -83,7 +83,6 @@ Item {
highlightMoveDuration: 500
boundsBehavior: Flickable.DragOverBounds
model: SortFilterProxyModel {
id: sortedMessageEventModel
@@ -173,8 +172,7 @@ Item {
visible: section !== aboveSection || Math.abs(time - aboveTime) > 600000
}
MessageDelegate {
}
MessageDelegate {}
}
}
@@ -191,8 +189,7 @@ Item {
visible: section !== aboveSection || Math.abs(time - aboveTime) > 600000
}
MessageDelegate {
}
MessageDelegate {}
}
}
@@ -300,60 +297,6 @@ Item {
}
}
}
Popup {
property alias listModel: readMarkerListView.model
x: (window.width - width) / 2
y: (window.height - height) / 2
width: 320
id: readMarkerDialog
parent: ApplicationWindow.overlay
modal: true
padding: 16
closePolicy: Dialog.CloseOnEscape | Dialog.CloseOnPressOutside
contentItem: AutoListView {
implicitHeight: Math.min(window.height - 64,
readMarkerListView.contentHeight)
id: readMarkerListView
clip: true
boundsBehavior: Flickable.DragOverBounds
delegate: ItemDelegate {
width: parent.width
height: 48
RowLayout {
anchors.fill: parent
anchors.margins: 8
spacing: 12
Avatar {
Layout.preferredWidth: height
Layout.fillHeight: true
source: modelData.avatar
hint: modelData.displayName
}
Label {
Layout.fillWidth: true
text: modelData.displayName
}
}
}
ScrollBar.vertical: ScrollBar {}
}
}
}
Control {