weyne/rustdesk
1
0
Fork 0
mirror of https://github.com/weyne85/rustdesk.git synced 2025-10-29 17:00:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4939 from 21pages/fix_chat

Browse Source 
opt chat model
This commit is contained in:
RustDesk
2023-07-10 16:10:23 +08:00
committed by GitHub
parent 142813a7e7 22994ee8f2
commit 4e19777ba0
7 changed files with 62 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
flutter/lib/desktop/pages/server_page.dart
View File

@@ -103,7 +103,7 @@ class ConnectionManagerState extends State<ConnectionManager> {
final client =
gFFI.serverModel.clients.firstWhereOrNull((e) => e.id == client_id);
if (client != null) {
gFFI.chatModel.changeCurrentID(MessageKey(client.peerId, client.id));
gFFI.chatModel.changeCurrentKey(MessageKey(client.peerId, client.id));
if (client.unreadChatMessageCount.value > 0) {
Future.delayed(Duration.zero, () {
client.unreadChatMessageCount.value = 0;
@@ -181,7 +181,8 @@ class ConnectionManagerState extends State<ConnectionManager> {
right: BorderSide(
color: Theme.of(context)
.dividerColor))),
child: ChatPage()),
child:
ChatPage(type: ChatPageType.desktopCM)),
),
)
: Offstage(),

2
flutter/lib/desktop/widgets/remote_toolbar.dart
View File

@@ -1453,7 +1453,7 @@ class _ChatMenuState extends State<_ChatMenu> {
initPos = Offset(pos.dx, pos.dy + _ToolbarTheme.dividerHeight);
}
widget.ffi.chatModel.changeCurrentID(
widget.ffi.chatModel.changeCurrentKey(
MessageKey(widget.ffi.id, ChatModel.clientModeID));
widget.ffi.chatModel.toggleChatOverlay(chatInitPos: initPos);
});