Merge pull request #6094 from dignow/fix/open_individual_window_offset

open individual window, add offset

flutter/lib/common.dart

@@ -1673,8 +1673,10 @@ Future<Offset?> _adjustRestoreMainWindowOffset(
 
 /// Restore window position and size on start
 /// Note that windowId must be provided if it's subwindow
+//
+// display is used to set the offset of the window in individual display mode.
 Future<bool> restoreWindowPosition(WindowType type,
-    {int? windowId, String? peerId}) async {
+    {int? windowId, String? peerId, int? display}) async {
   if (bind
       .mainGetEnv(key: "DISABLE_RUSTDESK_RESTORE_WINDOW_POSITION")
       .isNotEmpty) {
@@ -1710,14 +1712,22 @@ Future<bool> restoreWindowPosition(WindowType type,
     debugPrint("no window position saved, ignoring position restoration");
     return false;
   }
-  if (type == WindowType.RemoteDesktop &&
-      !isRemotePeerPos &&
-      windowId != null) {
-    if (lpos.offsetWidth != null) {
-      lpos.offsetWidth = lpos.offsetWidth! + windowId * 20;
+  if (type == WindowType.RemoteDesktop) {
+    if (!isRemotePeerPos && windowId != null) {
+      if (lpos.offsetWidth != null) {
+        lpos.offsetWidth = lpos.offsetWidth! + windowId * kNewWindowOffset;
+      }
+      if (lpos.offsetHeight != null) {
+        lpos.offsetHeight = lpos.offsetHeight! + windowId * kNewWindowOffset;
+      }
     }
-    if (lpos.offsetHeight != null) {
-      lpos.offsetHeight = lpos.offsetHeight! + windowId * 20;
+    if (display != null) {
+      if (lpos.offsetWidth != null) {
+        lpos.offsetWidth = lpos.offsetWidth! + display * kNewWindowOffset;
+      }
+      if (lpos.offsetHeight != null) {
+        lpos.offsetHeight = lpos.offsetHeight! + display * kNewWindowOffset;
+      }
     }
   }
 

flutter/lib/consts.dart

@@ -66,8 +66,10 @@ const int kWindowMainId = 0;
 const String kPointerEventKindTouch = "touch";
 const String kPointerEventKindMouse = "mouse";
 
-const String kKeyShowDisplaysAsIndividualWindows = 'displays_as_individual_windows';
-const String kKeyUseAllMyDisplaysForTheRemoteSession = 'use_all_my_displays_for_the_remote_session';
+const String kKeyShowDisplaysAsIndividualWindows =
+    'displays_as_individual_windows';
+const String kKeyUseAllMyDisplaysForTheRemoteSession =
+    'use_all_my_displays_for_the_remote_session';
 const String kKeyShowMonitorsToolbar = 'show_monitors_toolbar';
 
 // the executable name of the portable version
@@ -87,6 +89,14 @@ const int kDesktopMaxDisplaySize = 3840;
 const double kDesktopFileTransferRowHeight = 30.0;
 const double kDesktopFileTransferHeaderHeight = 25.0;
 
+double kNewWindowOffset = Platform.isWindows
+    ? 56.0
+    : Platform.isLinux
+        ? 50.0
+        : Platform.isMacOS
+            ? 30.0
+            : 50.0;
+
 EdgeInsets get kDragToResizeAreaPadding =>
     !kUseCompatibleUiMode && Platform.isLinux
         ? stateGlobal.fullscreen.isTrue || stateGlobal.isMaximized.value

flutter/lib/desktop/pages/remote_tab_page.dart

@@ -48,7 +48,8 @@ class _ConnectionTabPageState extends State<ConnectionTabPage> {
 
   late ToolbarState _toolbarState;
   String? peerId;
-  bool isScreenRectSet = false;
+  bool _isScreenRectSet = false;
+  int? _display;
 
   var connectionMap = RxList<Widget>.empty(growable: true);
 
@@ -61,7 +62,8 @@ class _ConnectionTabPageState extends State<ConnectionTabPage> {
     final display = params['display'];
     final displays = params['displays'];
     final screenRect = parseParamScreenRect(params);
-    isScreenRectSet = screenRect != null;
+    _isScreenRectSet = screenRect != null;
+    _display = display as int?;
     tryMoveToScreenAndSetFullscreen(screenRect);
     if (peerId != null) {
       ConnectionTypeState.init(peerId!);
@@ -202,7 +204,7 @@ class _ConnectionTabPageState extends State<ConnectionTabPage> {
       _update_remote_count();
       return returnValue;
     });
-    if (!isScreenRectSet) {
+    if (!_isScreenRectSet) {
       Future.delayed(Duration.zero, () {
         restoreWindowPosition(
           WindowType.RemoteDesktop,
@@ -210,6 +212,7 @@ class _ConnectionTabPageState extends State<ConnectionTabPage> {
           peerId: tabController.state.value.tabs.isEmpty
               ? null
               : tabController.state.value.tabs[0].key,
+          display: _display,
         );
       });
     }

flutter/lib/main.dart

@@ -200,8 +200,13 @@ void runMultiWindow(
     case kAppTypeDesktopRemote:
       // If screen rect is set, the window will be moved to the target screen and then set fullscreen.
       if (argument['screen_rect'] == null) {
-        await restoreWindowPosition(WindowType.RemoteDesktop,
-            windowId: kWindowId!, peerId: argument['id'] as String?);
+        // display can be used to control the offset of the window.
+        await restoreWindowPosition(
+          WindowType.RemoteDesktop,
+          windowId: kWindowId!,
+          peerId: argument['id'] as String?,
+          display: argument['display'] as int?,
+        );
       }
       break;
     case kAppTypeDesktopFileTransfer: