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

opt close on taskbar, not call onWindowClose multi times

Browse Source 
Signed-off-by: 21pages <pages21@163.com>
This commit is contained in:
21pages 2023-11-02 21:41:16 +08:00
parent 017c73132c
commit 0d01aa4eea
1 changed files with 6 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -583,32 +583,19 @@ class WindowActionPanelState extends State<WindowActionPanel>
void onWindowClose() async { void onWindowClose() async {
mainWindowClose() async => await windowManager.hide(); mainWindowClose() async => await windowManager.hide();
notMainWindowClose(WindowController controller) async { notMainWindowClose(WindowController controller) async {
if (widget.tabController.length == 0) { if (widget.tabController.length != 0) {
debugPrint("close emtpy multiwindow, hide");
await controller.hide();
await rustDeskWinManager
.call(WindowType.Main, kWindowEventHide, {"id": kWindowId!});
} else {
debugPrint("close not emtpy multiwindow from taskbar"); debugPrint("close not emtpy multiwindow from taskbar");
if (Platform.isWindows) { if (Platform.isWindows) {
await controller.show(); await controller.show();
await controller.focus(); await controller.focus();
final res = await widget.onClose?.call() ?? true; final res = await widget.onClose?.call() ?? true;
if (res) { if (!res) return;
Future.delayed(Duration.zero, () async {
// onWindowClose will be called again to hide
await WindowController.fromWindowId(kWindowId!).close();
});
} }
} else {
// ubuntu22.04 windowOnTop not work from taskbar
widget.tabController.clear(); widget.tabController.clear();
Future.delayed(Duration.zero, () async {
// onWindowClose will be called again to hide
await WindowController.fromWindowId(kWindowId!).close();
});
}
} }
await controller.hide();
await rustDeskWinManager
.call(WindowType.Main, kWindowEventHide, {"id": kWindowId!});
} }
macOSWindowClose( macOSWindowClose(