Merge pull request #2028 from Kingtous/master

fix: last window location calculation on windows

flutter/lib/common.dart

@@ -1,6 +1,7 @@
 import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
+import 'dart:math';
 import 'dart:typed_data';
 
 import 'package:back_button_interceptor/back_button_interceptor.dart';
@@ -1036,6 +1037,7 @@ Future<void> saveWindowPosition(WindowType type, {int? windowId}) async {
       final isMaximized = await wc.isMaximized();
       final pos = LastWindowPosition(
           sz.width, sz.height, position.dx, position.dy, isMaximized);
+      debugPrint("saving frame: ${windowId}: ${pos.width}/${pos.height}, offset:${pos.offsetWidth}/${pos.offsetHeight}");
       await Get.find<SharedPreferences>()
           .setString(kWindowPrefix + type.name, pos.toString());
       break;
@@ -1081,7 +1083,7 @@ Future<Size> _adjustRestoreMainWindowSize(double? width, double? height) async {
     restoreWidth = maxWidth;
   }
   if (restoreHeight > maxHeight) {
-    restoreWidth = maxHeight;
+    restoreHeight = maxHeight;
   }
   return Size(restoreWidth, restoreHeight);
 }
@@ -1092,11 +1094,11 @@ Future<Offset?> _adjustRestoreMainWindowOffset(
   if (left == null || top == null) {
     await windowManager.center();
   } else {
-    double windowLeft = left;
+    double windowLeft = max(0.0, left);
-    double windowTop = top;
+    double windowTop = max(0.0, top);
 
-    double frameLeft = 0;
+    double frameLeft = double.infinity;
-    double frameTop = 0;
+    double frameTop = double.infinity;
     double frameRight = ((isDesktop || isWebDesktop)
             ? kDesktopMaxDisplayWidth
             : kMobileMaxDisplayWidth)
@@ -1107,12 +1109,11 @@ Future<Offset?> _adjustRestoreMainWindowOffset(
         .toDouble();
 
     if (isDesktop || isWebDesktop) {
-      final screen = (await window_size.getWindowInfo()).screen;
+      for(final screen in await window_size.getScreenList()) {
-      if (screen != null) {
+        frameLeft = min(screen.visibleFrame.left, frameLeft);
-        frameLeft = screen.visibleFrame.left;
+        frameTop = min(screen.visibleFrame.top, frameTop);
-        frameTop = screen.visibleFrame.top;
+        frameRight = max(screen.visibleFrame.right, frameRight);
-        frameRight = screen.visibleFrame.right;
+        frameBottom = max(screen.visibleFrame.bottom, frameBottom);
-        frameBottom = screen.visibleFrame.bottom;
       }
     }
 
@@ -1174,6 +1175,7 @@ Future<bool> restoreWindowPosition(WindowType type, {int? windowId}) async {
             await _adjustRestoreMainWindowSize(lpos.width, lpos.height);
         final offset = await _adjustRestoreMainWindowOffset(
             lpos.offsetWidth, lpos.offsetHeight);
+        debugPrint("restore lpos: ${size.width}/${size.height}, offset:${offset?.dx}/${offset?.dy}");
         if (offset == null) {
           await wc.center();
         } else {

flutter/lib/desktop/pages/file_manager_tab_page.dart

@@ -96,8 +96,7 @@ class _FileManagerTabPageState extends State<FileManagerTabPage> {
 
   void onRemoveId(String id) {
     if (tabController.state.value.tabs.isEmpty) {
-      WindowController.fromWindowId(windowId()).hide();
+      WindowController.fromWindowId(windowId()).close();
-      rustDeskWinManager.call(WindowType.Main, kWindowEventHide, {"id": windowId()});
     }
   }
 

flutter/lib/desktop/pages/port_forward_tab_page.dart

@@ -107,8 +107,7 @@ class _PortForwardTabPageState extends State<PortForwardTabPage> {
 
   void onRemoveId(String id) {
     if (tabController.state.value.tabs.isEmpty) {
-      WindowController.fromWindowId(windowId()).hide();
+      WindowController.fromWindowId(windowId()).close();
-      rustDeskWinManager.call(WindowType.Main, kWindowEventHide, {"id": windowId()});
     }
   }
 

flutter/lib/desktop/pages/remote_tab_page.dart

@@ -97,9 +97,6 @@ class _ConnectionTabPageState extends State<ConnectionTabPage> {
       }
       _update_remote_count();
     });
-    Future.delayed(Duration.zero, () {
-      restoreWindowPosition(WindowType.RemoteDesktop, windowId: windowId());
-    });
   }
 
   @override
@@ -321,10 +318,9 @@ class _ConnectionTabPageState extends State<ConnectionTabPage> {
     );
   }
 
-  void onRemoveId(String id) {
+  void onRemoveId(String id) async {
     if (tabController.state.value.tabs.isEmpty) {
-      WindowController.fromWindowId(windowId()).hide();
+      await WindowController.fromWindowId(windowId()).close();
-      rustDeskWinManager.call(WindowType.Main, kWindowEventHide, {"id": windowId()});
     }
     ConnectionTypeState.delete(id);
     _update_remote_count();

flutter/lib/desktop/widgets/tabbar_widget.dart

@@ -506,7 +506,7 @@ class WindowActionPanelState extends State<WindowActionPanel>
       rustDeskWinManager.unregisterActiveWindow(0);
     } else {
       widget.onClose?.call();
-      WindowController.fromWindowId(windowId!).hide();
+      await WindowController.fromWindowId(windowId!).hide();
       rustDeskWinManager
           .call(WindowType.Main, kWindowEventHide, {"id": windowId!});
     }
@@ -555,12 +555,9 @@ class WindowActionPanelState extends State<WindowActionPanel>
                   // note: the main window can be restored by tray icon
                   Future.delayed(Duration.zero, () async {
                     if (widget.isMainWindow) {
-                      await windowManager.hide();
+                      await windowManager.close();
-                      rustDeskWinManager.unregisterActiveWindow(0);
                     } else {
-                      await WindowController.fromWindowId(windowId!).hide();
+                      await WindowController.fromWindowId(windowId!).close();
-                      rustDeskWinManager.call(
-                          WindowType.Main, kWindowEventHide, {"id": windowId!});
                     }
                   });
                 }

flutter/lib/main.dart

@@ -168,6 +168,20 @@ void runMultiWindow(
     widget,
     MyTheme.currentThemeMode(),
   );
+  switch (appType) {
+    case kAppTypeDesktopRemote:
+    await restoreWindowPosition(WindowType.RemoteDesktop, windowId: windowId!);
+      break;
+    case kAppTypeDesktopFileTransfer:
+    await restoreWindowPosition(WindowType.FileTransfer, windowId: windowId!);
+      break;
+    case kAppTypeDesktopPortForward:
+    await restoreWindowPosition(WindowType.PortForward, windowId: windowId!);
+      break;
+    default:
+      // no such appType
+      exit(0);
+  }
 }
 
 void runConnectionManagerScreen() async {