FreshRSS/NetNewsWire
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adds sidebar toggling from toolbar.

Browse Source
This commit is contained in:
Stuart Breckenridge 2020-08-10 08:01:16 +08:00
parent 86e07a58a3
commit 94a9557ba6
No known key found for this signature in database
GPG Key ID: 79BD673276AE83CE
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Multiplatform/Shared/SceneNavigationView.swift
View File

@ -8,6 +8,9 @@
import SwiftUI import SwiftUI
import Account import Account
#if os(macOS)
import AppKit
#endif
struct SceneNavigationView: View { struct SceneNavigationView: View {
@ -99,6 +102,14 @@ struct SceneNavigationView: View {
.toolbar { .toolbar {
#if os(macOS) #if os(macOS)
ToolbarItem(placement: .navigation) {
Button {
NSApp.keyWindow?.firstResponder?.tryToPerform(#selector(NSSplitViewController.toggleSidebar(_:)), with: nil)
} label: {
Image(systemName: "sidebar.left")
}
.help("Toggle Sidebar").padding(.trailing, 40)
}
ToolbarItem() { ToolbarItem() {
Menu { Menu {
Button("Add Web Feed", action: { sheetToShow = .web }) Button("Add Web Feed", action: { sheetToShow = .web })
@ -111,8 +122,6 @@ struct SceneNavigationView: View {
} }
ToolbarItem { ToolbarItem {
Button { Button {
// AccountManager.shared.refreshAll(errorHandler: handleRefreshError)
AccountManager.shared.refreshAll(completion: nil) AccountManager.shared.refreshAll(completion: nil)
} label: { } label: {
@ -130,10 +139,10 @@ struct SceneNavigationView: View {
.disabled(sceneModel.markAllAsReadButtonState == nil) .disabled(sceneModel.markAllAsReadButtonState == nil)
.help("Mark All as Read") .help("Mark All as Read")
} }
ToolbarItem { // ToolbarItem {
MacSearchField() // MacSearchField()
.frame(width: 200) // .frame(width: 200)
} // }
ToolbarItem { ToolbarItem {
Button { Button {
sceneModel.goToNextUnread() sceneModel.goToNextUnread()