From d7ef3df2b363ff98d998363b5f5eaf2a7d62326a Mon Sep 17 00:00:00 2001 From: 21pages Date: Tue, 11 Jul 2023 10:01:56 +0800 Subject: [PATCH] Revert "try fix linux cm abnormal show" This reverts commit 193426a3c10cb063db644068ac6f0df43c197341. --- flutter/lib/desktop/pages/server_page.dart | 2 +- flutter/lib/models/chat_model.dart | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/flutter/lib/desktop/pages/server_page.dart b/flutter/lib/desktop/pages/server_page.dart index 53088f69e..b1ebf9d71 100644 --- a/flutter/lib/desktop/pages/server_page.dart +++ b/flutter/lib/desktop/pages/server_page.dart @@ -186,7 +186,7 @@ class ConnectionManagerState extends State { ChatPage(type: ChatPageType.desktopCM)), ), ) - : Expanded(child: Container()), + : Offstage(), ), SizedBox( width: kConnectionManagerWindowSizeClosedChat.width - diff --git a/flutter/lib/models/chat_model.dart b/flutter/lib/models/chat_model.dart index 48476951f..fe1de2512 100644 --- a/flutter/lib/models/chat_model.dart +++ b/flutter/lib/models/chat_model.dart @@ -277,16 +277,16 @@ class ChatModel with ChangeNotifier { gFFI.chatModel.changeCurrentKey(key); } if (_isShowCMChatPage) { - await windowManager.setSizeAlignment( - kConnectionManagerWindowSizeClosedChat, Alignment.topRight); - await windowManager.show(); _isShowCMChatPage = !_isShowCMChatPage; notifyListeners(); + await windowManager.show(); + await windowManager.setSizeAlignment( + kConnectionManagerWindowSizeClosedChat, Alignment.topRight); } else { requestChatInputFocus(); + await windowManager.show(); await windowManager.setSizeAlignment( kConnectionManagerWindowSizeOpenChat, Alignment.topRight); - await windowManager.show(); _isShowCMChatPage = !_isShowCMChatPage; notifyListeners(); }