Merge pull request #4702 from 21pages/cm

show cm after receiving textchat when cm hidden

flutter/lib/main.dart

@@ -224,15 +224,16 @@ void runConnectionManagerScreen(bool hide) async {
     MyTheme.currentThemeMode(),
   );
   if (hide) {
-    hideCmWindow();
+    await hideCmWindow(isStartup: true);
   } else {
-    showCmWindow();
+    await showCmWindow(isStartup: true);
   }
   // Start the uni links handler and redirect links to Native, not for Flutter.
   _uniLinkSubscription = listenUniLinks(handleByFlutter: false);
 }
 
-void showCmWindow() {
+showCmWindow({bool isStartup = false}) async {
+  if (isStartup) {
     WindowOptions windowOptions = getHiddenTitleBarWindowOptions(
         size: kConnectionManagerWindowSizeClosedChat);
     windowManager.waitUntilReadyToShow(windowOptions, () async {
@@ -243,9 +244,20 @@ void showCmWindow() {
       await windowManager.setSizeAlignment(
           kConnectionManagerWindowSizeClosedChat, Alignment.topRight);
     });
+  } else {
+    if (await windowManager.getOpacity() != 1) {
+      await windowManager.setOpacity(1);
+      await windowManager.focus();
+      await windowManager.minimize(); //needed
+      await windowManager.setSizeAlignment(
+          kConnectionManagerWindowSizeClosedChat, Alignment.topRight);
+      window_on_top(null);
+    }
+  }
 }
 
-void hideCmWindow() {
+hideCmWindow({bool isStartup = false}) async {
+  if (isStartup) {
     WindowOptions windowOptions = getHiddenTitleBarWindowOptions(
         size: kConnectionManagerWindowSizeClosedChat);
     windowManager.setOpacity(0);
@@ -254,6 +266,12 @@ void hideCmWindow() {
       await windowManager.minimize();
       await windowManager.hide();
     });
+  } else {
+    await windowManager.setOpacity(0);
+    bind.mainHideDocker();
+    await windowManager.minimize();
+    await windowManager.hide();
+  }
 }
 
 void _runApp(

flutter/lib/models/chat_model.dart

@@ -13,6 +13,7 @@ import 'package:flutter_svg/flutter_svg.dart';
 import '../consts.dart';
 import '../common.dart';
 import '../common/widgets/overlay.dart';
+import '../main.dart';
 import 'model.dart';
 
 class MessageBody {
@@ -288,6 +289,10 @@ class ChatModel with ChangeNotifier {
       return;
     }
     if (text.isEmpty) return;
+    if (desktopType == DesktopType.cm) {
+      await showCmWindow();
+    }
+
     // mobile: first message show overlay icon
     if (!isDesktop && chatIconOverlayEntry == null) {
       showChatIconOverlay();

flutter/lib/models/server_model.dart

@@ -224,9 +224,9 @@ class ServerModel with ChangeNotifier {
       _hideCm = hideCm;
       if (desktopType == DesktopType.cm) {
         if (hideCm) {
-          hideCmWindow();
+          await hideCmWindow();
         } else {
-          showCmWindow();
+          await showCmWindow();
         }
       }
       update = true;