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

Merge the functionality of CollapseStateProxyModel into MessageFilterModel

Browse Source 
Merge the functionality of CollapseStateProxyModel into MessageFilterModel there is no need for a whole separate model the filters can be combined trivialy.
This commit is contained in:
James Graham
2023-08-28 10:31:18 +00:00
parent 59164d3bb2
commit 442612d31d
8 changed files with 238 additions and 272 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/qml/Component/TimelineView.qml
View File

@@ -47,19 +47,16 @@ QQC2.ScrollView {
interactive: Kirigami.Settings.isMobile
bottomMargin: Kirigami.Units.largeSpacing + Math.round(Kirigami.Theme.defaultFont.pointSize * 2)
model: collapseStateProxyModel
model: sortedMessageEventModel
MessageEventModel {
id: messageEventModel
room: root.currentRoom
}
CollapseStateProxyModel {
id: collapseStateProxyModel
sourceModel: MessageFilterModel {
id: sortedMessageEventModel
sourceModel: messageEventModel
}
MessageFilterModel {
id: sortedMessageEventModel
sourceModel: messageEventModel
}
Timer {
@@ -349,7 +346,7 @@ QQC2.ScrollView {
MediaMessageFilterModel {
id: mediaMessageFilterModel
sourceModel: collapseStateProxyModel
sourceModel: sortedMessageEventModel
}
Component {