This commit is contained in:
Alin
2024-02-27 17:08:38 -07:00
parent 80a128a619
commit faa7ec9457
10 changed files with 177 additions and 140 deletions
+4 -3
View File
@@ -20,7 +20,8 @@ struct GeneralSettingsTab: View {
@AppStorage("displayMode") var displayMode: DisplayMode = .system
@State private var selectedTheme = "Auto"
private let themes = ["Auto", "Dark", "Light"]
@Binding var showPopover: Bool
var body: some View {
Form {
VStack {
@@ -117,9 +118,9 @@ struct GeneralSettingsTab: View {
.toggleStyle(.switch)
.onChange(of: mini) { newVal in
if mini {
appState.currentView = miniView ? .apps : .empty
showPopover = false
resizeWindowAuto(windowSettings: windowSettings)
// showPopover = false
// appState.currentView = miniView ? .apps : .empty
} else {
resizeWindowAuto(windowSettings: windowSettings)
if appState.appInfo.appName.isEmpty {
+3 -2
View File
@@ -9,11 +9,12 @@ import SwiftUI
struct SettingsView: View {
@EnvironmentObject var appState: AppState
@Binding var showPopover: Bool
var body: some View {
TabView() {
GeneralSettingsTab()
GeneralSettingsTab(showPopover: $showPopover)
.tabItem {
Label(CurrentTabView.general.title, systemImage: "gear")
}