TheLanc3/rustdesk
1
0
Fork 0
mirror of https://github.com/rustdesk/rustdesk.git synced 2026-04-06 19:41:28 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix: last window location calculation

Browse Source
This commit is contained in:
Kingtous
2022-11-09 15:14:11 +08:00
parent 2af6441495
commit 200d8dc0f5
6 changed files with 38 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
flutter/lib/desktop/pages/file_manager_tab_page.dart
View File

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

3
flutter/lib/desktop/pages/port_forward_tab_page.dart
View File

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

8
flutter/lib/desktop/pages/remote_tab_page.dart
View File

@@ -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();
rustDeskWinManager.call(WindowType.Main, kWindowEventHide, {"id": windowId()});
await WindowController.fromWindowId(windowId()).close();
}
ConnectionTypeState.delete(id);
_update_remote_count();

13
flutter/lib/desktop/widgets/tabbar_widget.dart
View File

@@ -500,15 +500,19 @@ class WindowActionPanelState extends State<WindowActionPanel>
@override
void onWindowClose() async {
print("onWindowClose");
// hide window on close
if (widget.isMainWindow) {
await windowManager.hide();
rustDeskWinManager.unregisterActiveWindow(0);
} else {
widget.onClose?.call();
WindowController.fromWindowId(windowId!).hide();
final frame = await WindowController.fromWindowId(windowId!).getFrame();
await WindowController.fromWindowId(windowId!).hide();
rustDeskWinManager
.call(WindowType.Main, kWindowEventHide, {"id": windowId!});
final frame2 = await WindowController.fromWindowId(windowId!).getFrame();
print("${frame} ---hide--> ${frame2}");
}
super.onWindowClose();
}
@@ -555,12 +559,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();
rustDeskWinManager.unregisterActiveWindow(0);
await windowManager.close();
} else {
await WindowController.fromWindowId(windowId!).hide();
rustDeskWinManager.call(
WindowType.Main, kWindowEventHide, {"id": windowId!});
await WindowController.fromWindowId(windowId!).close();
}
});
}