Merge pull request #5295 from dignow/fix/separate_window_pos

Fix/separate windows pos

flutter/lib/common.dart

@@ -1424,17 +1424,18 @@ Future<void> saveWindowPosition(WindowType type, {int? windowId}) async {
       k: kWindowPrefix + type.name, v: pos.toString());
 
   if (type == WindowType.RemoteDesktop && windowId != null) {
-    await _saveSessionWindowPosition(windowId, pos);
+    await _saveSessionWindowPosition(type, windowId, pos);
   }
 }
 
-Future _saveSessionWindowPosition(int windowId, LastWindowPosition pos) async {
+Future _saveSessionWindowPosition(
+    WindowType windowType, int windowId, LastWindowPosition pos) async {
   final remoteList = await DesktopMultiWindow.invokeMethod(
       windowId, kWindowEventGetRemoteList, null);
   if (remoteList != null) {
     for (final peerId in remoteList.split(',')) {
       bind.sessionSetFlutterConfigByPeerId(
-          id: peerId, k: kWindowPrefix, v: pos.toString());
+          id: peerId, k: kWindowPrefix + windowType.name, v: pos.toString());
     }
   }
 }
@@ -1542,8 +1543,13 @@ Future<bool> restoreWindowPosition(WindowType type,
   bool isRemotePeerPos = false;
   String? pos;
   if (type == WindowType.RemoteDesktop && windowId != null && peerId != null) {
-    pos = await bind.sessionGetFlutterConfigByPeerId(
-        id: peerId, k: kWindowPrefix);
+    if (desktopType == DesktopType.main) {
+      pos = bind.mainGetPeerFlutterConfigSync(
+          id: peerId, k: kWindowPrefix + type.name);
+    } else {
+      pos = await bind.sessionGetFlutterConfigByPeerId(
+          id: peerId, k: kWindowPrefix + type.name);
+    }
     isRemotePeerPos = pos != null;
   }
   pos ??= bind.getLocalFlutterConfig(k: kWindowPrefix + type.name);

flutter/lib/utils/multi_window_manager.dart

@@ -99,6 +99,8 @@ class RustDeskMultiWindowManager {
         for (final windowId in windows) {
           if (_inactiveWindows.contains(windowId)) {
             await DesktopMultiWindow.invokeMethod(windowId, methodName, msg);
+            await restoreWindowPosition(type,
+                windowId: windowId, peerId: remoteId);
             WindowController.fromWindowId(windowId).show();
             registerActiveWindow(windowId);
             return;

src/flutter_ffi.rs

@@ -806,6 +806,10 @@ pub fn main_get_peer_option_sync(id: String, key: String) -> SyncReturn<String>
     SyncReturn(get_peer_option(id, key))
 }
 
+pub fn main_get_peer_flutter_config_sync(id: String, k: String) -> SyncReturn<String> {
+    SyncReturn(get_peer_flutter_config(id, k))
+}
+
 pub fn main_set_peer_option(id: String, key: String, value: String) {
     set_peer_option(id, key, value)
 }

src/ui_interface.rs

@@ -201,6 +201,13 @@ pub fn get_peer_option(id: String, name: String) -> String {
     c.options.get(&name).unwrap_or(&"".to_owned()).to_owned()
 }
 
+#[inline]
+#[cfg(feature = "flutter")]
+pub fn get_peer_flutter_config(id: String, name: String) -> String {
+    let c = PeerConfig::load(&id);
+    c.ui_flutter.get(&name).unwrap_or(&"".to_owned()).to_owned()
+}
+
 #[inline]
 pub fn set_peer_option(id: String, name: String, value: String) {
     let mut c = PeerConfig::load(&id);

src/ui_session_interface.rs

@@ -202,7 +202,7 @@ impl<T: InvokeUiSession> Session<T> {
     }
 
     pub fn get_flutter_config(&self, k: String) -> String {
-        self.lc.write().unwrap().get_ui_flutter(&k)
+        self.lc.read().unwrap().get_ui_flutter(&k)
     }
 
     pub fn toggle_option(&mut self, name: String) {