TheLanc3/rustdesk
1
0
Fork 0
mirror of https://github.com/rustdesk/rustdesk.git synced 2026-04-21 21:13:21 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix chat model

Browse Source
This commit is contained in:
rustdesk
2022-05-16 00:01:27 +08:00
parent 0b869e89a3
commit c3bc539a61
7 changed files with 91 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
flutter/lib/pages/chat_page.dart
View File

@@ -21,10 +21,9 @@ class ChatPage extends StatelessWidget implements PageShape {
icon: Icon(Icons.group),
itemBuilder: (context) {
final chatModel = FFI.chatModel;
final serverModel = FFI.serverModel;
return chatModel.messages.entries.map((entry) {
final id = entry.key;
final user = serverModel.clients[id]?.chatUser ?? chatModel.me;
final user = entry.value.chatUser;
return PopupMenuItem<int>(
child: Text("${user.name} ${user.uid}"),
value: id,
@@ -54,7 +53,9 @@ class ChatPage extends StatelessWidget implements PageShape {
chatModel.send(chatMsg);
},
user: chatModel.me,
messages: chatModel.messages[chatModel.currentID] ?? [],
messages:
chatModel.messages[chatModel.currentID]?.chatMessages ??
[],
// default scrollToBottom has bug https://github.com/fayeed/dash_chat/issues/53
scrollToBottom: false,
scrollController: chatModel.scroller,