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

Merge pull request #4934 from 21pages/fix_chat

Browse Source 
opt mobile chat page
This commit is contained in:
RustDesk
2023-07-10 13:27:09 +08:00
committed by GitHub
parent e1bd925877 6c6f6c081e
commit 8028b23086
11 changed files with 222 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -100,14 +100,14 @@ class ConnectionManagerState extends State<ConnectionManager> {
gFFI.serverModel.tabController.onSelected = (client_id_str) {
final client_id = int.tryParse(client_id_str);
if (client_id != null) {
gFFI.chatModel.changeCurrentID(client_id);
final client =
gFFI.serverModel.clients.firstWhereOrNull((e) => e.id == client_id);
if (client != null) {
gFFI.chatModel.changeCurrentID(MessageKey(client.peerId, client.id));
if (client.unreadChatMessageCount.value > 0) {
Future.delayed(Duration.zero, () {
client.unreadChatMessageCount.value = 0;
gFFI.chatModel.showChatPage(client.id);
gFFI.chatModel.showChatPage(MessageKey(client.peerId, client.id));
});
}
windowManager.setTitle(getWindowNameWithId(client.peerId));
@@ -444,7 +444,8 @@ class _CmHeaderState extends State<_CmHeader>
child: IconButton(
onPressed: () => checkClickTime(
client.id,
() => gFFI.chatModel.toggleCMChatPage(client.id),
() => gFFI.chatModel
.toggleCMChatPage(MessageKey(client.peerId, client.id)),
),
icon: SvgPicture.asset('assets/chat2.svg'),
splashRadius: kDesktopIconButtonSplashRadius,

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

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