renun/NetNewsWire
1
0
Fork 0
mirror of https://github.com/Ranchero-Software/NetNewsWire synced 2025-08-12 06:26:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'swiftui'

Browse Source
This commit is contained in:
Maurice Parker
2020-07-10 15:28:14 -05:00
parent 6672013111 206f0e7263
commit 95a8f6d72d
236 changed files with 12329 additions and 369 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Mac/MainWindow/MainWindowController.swift
View File

@@ -61,7 +61,7 @@ class MainWindowController : NSWindowController, NSUserInterfaceValidations {
sharingServicePickerDelegate = SharingServicePickerDelegate(self.window)
if !AppDefaults.showTitleOnMainWindow {
if !AppDefaults.shared.showTitleOnMainWindow {
window?.titleVisibility = .hidden
}
@@ -116,12 +116,12 @@ class MainWindowController : NSWindowController, NSUserInterfaceValidations {
}
func saveStateToUserDefaults() {
AppDefaults.windowState = savableState()
AppDefaults.shared.windowState = savableState()
window?.saveFrame(usingName: windowAutosaveName)
}
func restoreStateFromUserDefaults() {
if let state = AppDefaults.windowState {
if let state = AppDefaults.shared.windowState {
restoreState(from: state)
window?.setFrameUsingName(windowAutosaveName, force: true)
}
@@ -294,7 +294,7 @@ class MainWindowController : NSWindowController, NSUserInterfaceValidations {
@IBAction func openInBrowserUsingOppositeOfSettings(_ sender: Any?) {
if let link = currentLink {
Browser.open(link, inBackground: !AppDefaults.openInBrowserInBackground)
Browser.open(link, inBackground: !AppDefaults.shared.openInBrowserInBackground)
}
}
@@ -832,7 +832,7 @@ private extension MainWindowController {
}
func validateToggleArticleExtractor(_ item: NSValidatedUserInterfaceItem) -> Bool {
guard !AppDefaults.isDeveloperBuild else {
guard !AppDefaults.shared.isDeveloperBuild else {
return false
}