feat: exit tray item

This commit is contained in:
cialloo
2024-07-26 20:45:44 +08:00
committed by Cialloo
parent b86e704d45
commit e7f6275f8f
3 changed files with 88 additions and 71 deletions

View File

@@ -3,6 +3,7 @@ import 'dart:io';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:window_manager/window_manager.dart'; import 'package:window_manager/window_manager.dart';
import 'package:winui_n2n/edge_state.dart'; import 'package:winui_n2n/edge_state.dart';
import 'package:winui_n2n/globals.dart';
import 'package:winui_n2n/home_page.dart'; import 'package:winui_n2n/home_page.dart';
import 'package:winui_n2n/shared_pref_singleton.dart'; import 'package:winui_n2n/shared_pref_singleton.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart';
@@ -32,6 +33,7 @@ class _ApplicationExitControlState extends State<ApplicationExitControl> {
} }
Future<AppExitResponse> _handleExitRequest() async { Future<AppExitResponse> _handleExitRequest() async {
if (!forceExit) {
if (SharedPrefSingleton().minimizeOnQuit == null) { if (SharedPrefSingleton().minimizeOnQuit == null) {
final exitApp = await showDialog<bool?>( final exitApp = await showDialog<bool?>(
context: context, context: context,
@@ -110,6 +112,7 @@ class _ApplicationExitControlState extends State<ApplicationExitControl> {
return AppExitResponse.cancel; return AppExitResponse.cancel;
} }
} }
}
// Uninstall tap device before exit // Uninstall tap device before exit
final findTapResult = await Process.run( final findTapResult = await Process.run(

View File

@@ -2,3 +2,5 @@ import 'package:flutter/material.dart';
final GlobalKey<ScaffoldMessengerState> snackbarKey = final GlobalKey<ScaffoldMessengerState> snackbarKey =
GlobalKey<ScaffoldMessengerState>(); GlobalKey<ScaffoldMessengerState>();
bool forceExit = false;

View File

@@ -1,7 +1,11 @@
import 'dart:ui';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:window_manager/window_manager.dart'; import 'package:window_manager/window_manager.dart';
import 'package:winui_n2n/control_page.dart'; import 'package:winui_n2n/control_page.dart';
import 'package:winui_n2n/about_page.dart'; import 'package:winui_n2n/about_page.dart';
import 'package:winui_n2n/globals.dart';
import 'package:winui_n2n/logger_page.dart'; import 'package:winui_n2n/logger_page.dart';
import 'package:winui_n2n/main.dart'; import 'package:winui_n2n/main.dart';
import 'package:winui_n2n/setting_page.dart'; import 'package:winui_n2n/setting_page.dart';
@@ -57,6 +61,14 @@ class _HomePageState extends State<HomePage> with TrayListener {
windowManager.show(); windowManager.show();
}, },
), ),
MenuItem(
key: 'exit_app',
label: AppLocalizations.of(context)!.exit,
onClick: (menuItem) {
forceExit = true;
ServicesBinding.instance.exitApplication(AppExitType.required);
},
)
], ],
); );
trayManager.setContextMenu(menu); trayManager.setContextMenu(menu);