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

Switch to release branch.

Browse Source
This commit is contained in:
Black Hat
2018-07-08 20:54:06 +08:00
parent d83d00f967
commit d6b5cba61f
6 changed files with 275 additions and 242 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
qml/Room.qml
View File

@@ -1,4 +1,4 @@
import QtQuick 2.10
import QtQuick 2.11
import QtQuick.Controls 2.3
import QtQuick.Layouts 1.3
import Matrique 0.1

2
qml/form/ListForm.qml
View File

@@ -180,6 +180,8 @@ Item {
}
highlightMoveDuration: 250
currentIndex: -1
ScrollBar.vertical: ScrollBar { id: scrollBar }
model: delegateModel

14
qml/form/RoomForm.qml
View File

@@ -16,7 +16,7 @@ Item {
background: Item {
anchors.fill: parent
visible: currentRoom === null
visible: currentRoom == null
Pane {
anchors.fill: parent
}
@@ -32,7 +32,7 @@ Item {
anchors.fill: parent
spacing: 0
visible: currentRoom !== null
visible: currentRoom != null
Pane {
z: 10
@@ -61,7 +61,7 @@ Item {
Label {
Layout.fillWidth: true
text: currentRoom !== null ? currentRoom.displayName : ""
text: currentRoom != null ? currentRoom.displayName : ""
font.pointSize: 16
elide: Text.ElideRight
wrapMode: Text.NoWrap
@@ -69,7 +69,7 @@ Item {
Label {
Layout.fillWidth: true
text: currentRoom !== null ? currentRoom.topic : ""
text: currentRoom != null ? currentRoom.topic : ""
elide: Text.ElideRight
wrapMode: Text.NoWrap
}
@@ -91,6 +91,8 @@ Item {
model: MessageEventModel{
id: messageEventModel
room: currentRoom
onModelReset: currentRoom.getPreviousContent(50)
}
delegate: Row {
readonly property bool sentByMe: author === currentRoom.localUser
@@ -127,6 +129,10 @@ Item {
}
ScrollBar.vertical: ScrollBar { /*anchors.left: messageListView.right*/ }
onAtYBeginningChanged: {
if(currentRoom && atYBeginning) currentRoom.getPreviousContent(50)
}
}
Pane {