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

fix: use multi window controller to close window

Browse Source
This commit is contained in:
kingtous 2022-08-09 16:37:11 +08:00
parent 5a953cc8df
commit d76782a0fc
3 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
flutter/lib/desktop/pages/connection_tab_page.dart
View File

@ -1,6 +1,7 @@
import 'dart:convert'; import 'dart:convert';
import 'dart:math'; import 'dart:math';
import 'package:desktop_multi_window/desktop_multi_window.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_hbb/common.dart'; import 'package:flutter_hbb/common.dart';
import 'package:flutter_hbb/consts.dart'; import 'package:flutter_hbb/consts.dart';
@ -114,7 +115,11 @@ class _ConnectionTabPageState extends State<ConnectionTabPage>
tabController.value = TabController( tabController.value = TabController(
length: connectionIds.length, vsync: this, initialIndex: initialIndex); length: connectionIds.length, vsync: this, initialIndex: initialIndex);
if (connectionIds.length == 0) { if (connectionIds.length == 0) {
windowManager.close(); WindowController.fromWindowId(windowId()).close();
} }
} }
int windowId() {
return widget.params["windowId"];
}
} }

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

@ -1,6 +1,7 @@
import 'dart:convert'; import 'dart:convert';
import 'dart:math'; import 'dart:math';
import 'package:desktop_multi_window/desktop_multi_window.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_hbb/common.dart'; import 'package:flutter_hbb/common.dart';
import 'package:flutter_hbb/desktop/pages/file_manager_page.dart'; import 'package:flutter_hbb/desktop/pages/file_manager_page.dart';
@ -114,7 +115,11 @@ class _FileManagerTabPageState extends State<FileManagerTabPage>
tabController.value = TabController( tabController.value = TabController(
length: connectionIds.length, initialIndex: initialIndex, vsync: this); length: connectionIds.length, initialIndex: initialIndex, vsync: this);
if (connectionIds.length == 0) { if (connectionIds.length == 0) {
windowManager.close(); WindowController.fromWindowId(windowId()).close();
} }
} }
int windowId() {
return widget.params["windowId"];
}
} }

1
flutter/lib/main.dart
View File

@ -36,6 +36,7 @@ Future<Null> main(List<String> args) async {
? Map<String, dynamic>() ? Map<String, dynamic>()
: jsonDecode(args[2]) as Map<String, dynamic>; : jsonDecode(args[2]) as Map<String, dynamic>;
int type = argument['type'] ?? -1; int type = argument['type'] ?? -1;
argument['windowId'] = windowId;
WindowType wType = type.windowType; WindowType wType = type.windowType;
switch (wType) { switch (wType) {
case WindowType.RemoteDesktop: case WindowType.RemoteDesktop: