FreshRSS/NetNewsWire
1
0
Fork 0
mirror of https://github.com/Ranchero-Software/NetNewsWire.git synced 2025-02-10 00:50:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'mac-candidate'

Browse Source
This commit is contained in:
Brent Simmons 2019-08-23 18:55:09 -07:00
commit ed56376d03
4 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Mac/AppDelegate.swift
View File

@ -146,6 +146,9 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserInterfaceValidations,
updateSortMenuItems() updateSortMenuItems()
createAndShowMainWindow() createAndShowMainWindow()
if isFirstRun {
mainWindowController?.window?.center()
}
NotificationCenter.default.addObserver(self, selector: #selector(feedSettingDidChange(_:)), name: .FeedSettingDidChange, object: nil) NotificationCenter.default.addObserver(self, selector: #selector(feedSettingDidChange(_:)), name: .FeedSettingDidChange, object: nil)
NotificationCenter.default.addObserver(self, selector: #selector(userDefaultsDidChange(_:)), name: UserDefaults.didChangeNotification, object: nil) NotificationCenter.default.addObserver(self, selector: #selector(userDefaultsDidChange(_:)), name: UserDefaults.didChangeNotification, object: nil)

3
Mac/MainWindow/Sidebar/SidebarViewController.swift
View File

@ -363,11 +363,10 @@ private extension SidebarViewController {
func rebuildTreeAndReloadDataIfNeeded() { func rebuildTreeAndReloadDataIfNeeded() {
if !animatingChanges && !BatchUpdate.shared.isPerforming { if !animatingChanges && !BatchUpdate.shared.isPerforming {
if treeController.rebuild() { treeController.rebuild()
outlineView.reloadData() outlineView.reloadData()
} }
} }
}
func restoreSelection(to nodes: [Node], sendNotificationIfChanged: Bool) { func restoreSelection(to nodes: [Node], sendNotificationIfChanged: Bool) {
if selectedNodes == nodes { // Nothing to do? if selectedNodes == nodes { // Nothing to do?

5
Mac/Preferences/PreferencesWindowController.swift
View File

@ -29,7 +29,6 @@ private struct ToolbarItemIdentifier {
class PreferencesWindowController : NSWindowController, NSToolbarDelegate { class PreferencesWindowController : NSWindowController, NSToolbarDelegate {
private let windowFrameName = "Preferences"
private let windowWidth = CGFloat(512.0) // Width is constant for all views; only the height changes private let windowWidth = CGFloat(512.0) // Width is constant for all views; only the height changes
private var viewControllers = [String: NSViewController]() private var viewControllers = [String: NSViewController]()
private let toolbarItemSpecs: [PreferencesToolbarItemSpec] = { private let toolbarItemSpecs: [PreferencesToolbarItemSpec] = {
@ -51,9 +50,9 @@ class PreferencesWindowController : NSWindowController, NSToolbarDelegate {
window?.showsToolbarButton = false window?.showsToolbarButton = false
window?.toolbar = toolbar window?.toolbar = toolbar
window?.setFrameAutosaveName(NSWindow.FrameAutosaveName(windowFrameName))
switchToViewAtIndex(0) switchToViewAtIndex(0)
window?.center()
} }
// MARK: Actions // MARK: Actions

4
Mac/Resources/Info.plist
View File

@ -17,7 +17,7 @@
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
<string>APPL</string> <string>APPL</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>5.0b5</string> <string>5.0b6</string>
<key>CFBundleURLTypes</key> <key>CFBundleURLTypes</key>
<array> <array>
<dict> <dict>
@ -33,7 +33,7 @@
</dict> </dict>
</array> </array>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>2607</string> <string>2608</string>
<key>LSApplicationCategoryType</key> <key>LSApplicationCategoryType</key>
<string>public.app-category.news</string> <string>public.app-category.news</string>
<key>LSMinimumSystemVersion</key> <key>LSMinimumSystemVersion</key>