diff --git a/punchnet/Views/Settings/SettingsView.swift b/punchnet/Views/Settings/SettingsView.swift index 3f86e23..17fc4f8 100644 --- a/punchnet/Views/Settings/SettingsView.swift +++ b/punchnet/Views/Settings/SettingsView.swift @@ -23,45 +23,47 @@ struct SettingsView: View { var body: some View { NavigationSplitView(columnVisibility: $columnVisibility) { - List(MenuItem.allCases, id: \.self) { menu in + List(MenuItem.allCases, id: \.self, selection: $selectedMenu) { menu in HStack(alignment: .center) { - Rectangle() - .frame(width: 3, height: 25) - .foregroundColor(self.selectedMenu == menu ? .black : .clear) +// Rectangle() +// .frame(width: 3, height: 25) +// .foregroundColor(self.selectedMenu == menu ? .black : .clear) Text(menu.rawValue) Spacer() } - .contentShape(Rectangle()) - .onTapGesture { - self.selectedMenu = menu - } - .onHover { inside in - hovering = inside - if inside { - NSCursor.pointingHand.push() - } else { - NSCursor.pop() - } - } +// .contentShape(Rectangle()) +// .onTapGesture { +// self.selectedMenu = menu +// } +// .onHover { inside in +// hovering = inside +// if inside { +// NSCursor.pointingHand.push() +// } else { +// NSCursor.pop() +// } +// } } .listStyle(.sidebar) .frame(minWidth: 180, idealWidth: 200, maxWidth: 250) } detail: { VStack(alignment: .leading, spacing: 0) { - switch self.selectedMenu { - case .accout: - SettingsAccountView(state: self.state) - case .network: - SettingsNetworkView(state: self.state) - case .device: - SettingsDeviceView() - case .system: - SettingsSystemView() - case .about: - SettingsAboutView() + Group { + switch self.selectedMenu { + case .accout: + SettingsAccountView(state: self.state) + case .network: + SettingsNetworkView(state: self.state) + case .device: + SettingsDeviceView() + case .system: + SettingsSystemView() + case .about: + SettingsAboutView() + } } Spacer() }