From 0dba0130893b54951fe3df3b9ce4997037a0a7ca Mon Sep 17 00:00:00 2001
From: csf <csf@breakbeat.cn>
Date: Wed, 8 Feb 2023 21:54:48 +0900
Subject: [PATCH] remove unused Overlay in desktop_tab_page.dart and
 server_page.dart

---
 .../lib/desktop/pages/desktop_tab_page.dart   | 28 +++++++---------
 flutter/lib/desktop/pages/server_page.dart    | 33 ++++++++-----------
 2 files changed, 24 insertions(+), 37 deletions(-)

diff --git a/flutter/lib/desktop/pages/desktop_tab_page.dart b/flutter/lib/desktop/pages/desktop_tab_page.dart
index c1965921c..35d5a61ef 100644
--- a/flutter/lib/desktop/pages/desktop_tab_page.dart
+++ b/flutter/lib/desktop/pages/desktop_tab_page.dart
@@ -64,23 +64,17 @@ class _DesktopTabPageState extends State<DesktopTabPage> {
   @override
   Widget build(BuildContext context) {
     final tabWidget = Container(
-      child: Overlay(initialEntries: [
-        OverlayEntry(builder: (context) {
-          gFFI.dialogManager.setOverlayState(Overlay.of(context));
-          return Scaffold(
-              backgroundColor: Theme.of(context).backgroundColor,
-              body: DesktopTab(
-                controller: tabController,
-                tail: ActionIcon(
-                  message: 'Settings',
-                  icon: IconFont.menu,
-                  onTap: DesktopTabPage.onAddSetting,
-                  isClose: false,
-                ),
-              ));
-        })
-      ]),
-    );
+        child: Scaffold(
+            backgroundColor: Theme.of(context).backgroundColor,
+            body: DesktopTab(
+              controller: tabController,
+              tail: ActionIcon(
+                message: 'Settings',
+                icon: IconFont.menu,
+                onTap: DesktopTabPage.onAddSetting,
+                isClose: false,
+              ),
+            )));
     return Platform.isMacOS
         ? tabWidget
         : Obx(
diff --git a/flutter/lib/desktop/pages/server_page.dart b/flutter/lib/desktop/pages/server_page.dart
index 521413647..b4d7f4fac 100644
--- a/flutter/lib/desktop/pages/server_page.dart
+++ b/flutter/lib/desktop/pages/server_page.dart
@@ -68,26 +68,19 @@ class _DesktopServerPageState extends State<DesktopServerPage>
         ],
         child: Consumer<ServerModel>(
             builder: (context, serverModel, child) => Container(
-                  decoration: BoxDecoration(
-                      border:
-                          Border.all(color: MyTheme.color(context).border!)),
-                  child: Overlay(initialEntries: [
-                    OverlayEntry(builder: (context) {
-                      gFFI.dialogManager.setOverlayState(Overlay.of(context));
-                      return Scaffold(
-                        backgroundColor: Theme.of(context).backgroundColor,
-                        body: Center(
-                          child: Column(
-                            mainAxisAlignment: MainAxisAlignment.start,
-                            children: [
-                              Expanded(child: ConnectionManager()),
-                            ],
-                          ),
-                        ),
-                      );
-                    })
-                  ]),
-                )));
+                decoration: BoxDecoration(
+                    border: Border.all(color: MyTheme.color(context).border!)),
+                child: Scaffold(
+                  backgroundColor: Theme.of(context).backgroundColor,
+                  body: Center(
+                    child: Column(
+                      mainAxisAlignment: MainAxisAlignment.start,
+                      children: [
+                        Expanded(child: ConnectionManager()),
+                      ],
+                    ),
+                  ),
+                ))));
   }
 
   @override