Fixed shortcuts not working after interacting with dialog widget

Gold872 · Oct 23, 2023 · 0b362fd · 0b362fd
1 parent 38eb132
commit 0b362fd
Showing 1 changed file with 12 additions and 0 deletions.
diff --git a/lib/pages/dashboard_page.dart b/lib/pages/dashboard_page.dart
@@ -47,6 +47,8 @@ class _DashboardPageState extends State<DashboardPage> with WindowListener {
   late final SharedPreferences _preferences;
   late final UpdateChecker updateChecker;
 
+  late final FocusNode dashboardFocusNode;
+
   final List<DashboardGrid> grids = [];
 
   final List<TabData> tabData = [];
@@ -62,6 +64,8 @@ class _DashboardPageState extends State<DashboardPage> with WindowListener {
     _preferences = widget.preferences;
     updateChecker = UpdateChecker(currentVersion: widget.version);
 
+    dashboardFocusNode = FocusNode();
+
     windowManager.addListener(this);
     Future(() async => await windowManager.setPreventClose(true));
 
@@ -187,6 +191,7 @@ class _DashboardPageState extends State<DashboardPage> with WindowListener {
 
   @override
   void dispose() async {
+    dashboardFocusNode.dispose();
     windowManager.removeListener(this);
     super.dispose();
   }
@@ -851,7 +856,14 @@ class _DashboardPageState extends State<DashboardPage> with WindowListener {
           },
         },
         child: Focus(
+          focusNode: dashboardFocusNode,
           autofocus: true,
+          canRequestFocus: true,
+          onFocusChange: (value) {
+            if (!value) {
+              dashboardFocusNode.requestFocus();
+            }
+          },
           child: Column(
             crossAxisAlignment: CrossAxisAlignment.center,
             children: [