Split background menu

2023-07-20 06:44:39 +08:00
parent 7a616bbe15
commit fdbf50d875
6 changed files with 43 additions and 9 deletions
@@ -28,15 +28,10 @@ public struct ExtensionStatusView: View {
                            StatusItem("Downlink", LibboxFormatBytes(message.downlink) + "/s")
                            StatusItem("Uplink Total", LibboxFormatBytes(message.uplinkTotal))
                            StatusItem("Downlink Total", LibboxFormatBytes(message.downlinkTotal))
-                        } else {
-                            #if os(macOS)
-                                StatusItem("Connections", "\(message.connectionsOut)")
-                            #endif
                        }
                    } else {
                        StatusItem("Memory", "Loading...")
                        StatusItem("Goroutines", "Loading...")
-                        StatusItem("Connections", "Loading...")
                    }
                }.background {
                    GeometryReader { geometry in
@@ -17,6 +17,7 @@ public struct SettingView: View {
    #if os(macOS)
        @State private var startAtLogin = false
        @Environment(\.showMenuBarExtra) private var showMenuBarExtra
+        @State private var keepMenuBarInBackground = false
    #endif

    @State private var disableMemoryLimit = false
@@ -51,8 +52,19 @@ public struct SettingView: View {
                                .onChange(of: showMenuBarExtra.wrappedValue) { newValue in
                                    Task.detached {
                                        SharedPreferences.showMenuBarExtra = newValue
+                                        if !newValue {
+                                            keepMenuBarInBackground = false
+                                        }
                                    }
                                }
+                            if showMenuBarExtra.wrappedValue {
+                                Toggle("Keep Menu Bar in Background", isOn: $keepMenuBarInBackground)
+                                    .onChange(of: keepMenuBarInBackground) { newValue in
+                                        Task.detached {
+                                            SharedPreferences.menuBarExtraInBackground = newValue
+                                        }
+                                    }
+                            }
                        }
                    #endif
                    Section("Packet Tunnel") {
@@ -132,6 +144,7 @@ public struct SettingView: View {
    private func loadSettings() async {
        #if os(macOS)
            startAtLogin = SMAppService.mainApp.status == .enabled
+            keepMenuBarInBackground = SharedPreferences.menuBarExtraInBackground
        #endif
        disableMemoryLimit = SharedPreferences.disableMemoryLimit
        version = LibboxVersion()