hongshaorou/rustdesk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix, set window position before show when reusing window

Browse Source 
Signed-off-by: dignow <linlong1265@gmail.com>
This commit is contained in:
dignow 2023-08-09 18:37:09 +08:00
parent 09a6b3c30a
commit 28cbe0f464
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
flutter/lib/common.dart
View File

@ -1543,6 +1543,8 @@ Future<bool> restoreWindowPosition(WindowType type,
bool isRemotePeerPos = false; bool isRemotePeerPos = false;
String? pos; String? pos;
// No need to check mainGetLocalBoolOptionSync(kOptionOpenNewConnInTabs)
// Though "open in tabs" is true and the new window restore peer position, it's ok.
if (type == WindowType.RemoteDesktop && windowId != null && peerId != null) { if (type == WindowType.RemoteDesktop && windowId != null && peerId != null) {
// If the restore position is called by main window, and the peer id is not null // If the restore position is called by main window, and the peer id is not null
// then we may need to get the position by reading the peer config. // then we may need to get the position by reading the peer config.

2
flutter/lib/utils/multi_window_manager.dart
View File

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