mirror of
https://github.com/rustdesk/rustdesk.git
synced 2024-11-24 20:59:37 +08:00
fix: macos location restore incorrectly
This commit is contained in:
parent
82fb521a2c
commit
60ff4982ca
@ -71,9 +71,6 @@ class _FileManagerTabPageState extends State<FileManagerTabPage> {
|
||||
reloadCurrentWindow();
|
||||
}
|
||||
});
|
||||
Future.delayed(Duration.zero, () {
|
||||
restoreWindowPosition(WindowType.FileTransfer, windowId: windowId());
|
||||
});
|
||||
}
|
||||
|
||||
@override
|
||||
|
@ -79,9 +79,6 @@ class _PortForwardTabPageState extends State<PortForwardTabPage> {
|
||||
reloadCurrentWindow();
|
||||
}
|
||||
});
|
||||
Future.delayed(Duration.zero, () {
|
||||
restoreWindowPosition(WindowType.PortForward, windowId: windowId());
|
||||
});
|
||||
}
|
||||
|
||||
@override
|
||||
|
@ -122,20 +122,20 @@ void runMainApp(bool startService) async {
|
||||
}
|
||||
gFFI.userModel.refreshCurrentUser();
|
||||
runApp(App());
|
||||
// restore the location of the main window before window hide or show
|
||||
await restoreWindowPosition(WindowType.Main);
|
||||
// check the startup argument, if we successfully handle the argument, we keep the main window hidden.
|
||||
if (checkArguments()) {
|
||||
windowManager.hide();
|
||||
} else {
|
||||
windowManager.show();
|
||||
windowManager.focus();
|
||||
// move registration of active main window here to prevent async visible check.
|
||||
rustDeskWinManager.registerActiveWindow(kWindowMainId);
|
||||
}
|
||||
// set window option
|
||||
// Set window option.
|
||||
WindowOptions windowOptions = getHiddenTitleBarWindowOptions();
|
||||
windowManager.waitUntilReadyToShow(windowOptions, () async {
|
||||
// Restore the location of the main window before window hide or show.
|
||||
await restoreWindowPosition(WindowType.Main);
|
||||
// Check the startup argument, if we successfully handle the argument, we keep the main window hidden.
|
||||
if (checkArguments()) {
|
||||
windowManager.hide();
|
||||
} else {
|
||||
windowManager.show();
|
||||
windowManager.focus();
|
||||
// Move registration of active main window here to prevent from async visible check.
|
||||
rustDeskWinManager.registerActiveWindow(kWindowMainId);
|
||||
}
|
||||
windowManager.setOpacity(1);
|
||||
});
|
||||
windowManager.setTitle(getWindowName());
|
||||
|
@ -59,7 +59,7 @@ dependencies:
|
||||
desktop_multi_window:
|
||||
git:
|
||||
url: https://github.com/Kingtous/rustdesk_desktop_multi_window
|
||||
ref: 057e6eb1bc7dcbcf9dafd1384274a611e4fe7124
|
||||
ref: bc8604a88e52b2b6e64d2661ae49a71450a47af8
|
||||
freezed_annotation: ^2.0.3
|
||||
flutter_custom_cursor: ^0.0.2
|
||||
window_size:
|
||||
|
Loading…
Reference in New Issue
Block a user