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

Fix lint issues.

Browse Source
This commit is contained in:
Brent Simmons
2025-01-22 22:17:02 -08:00
parent 8f1379360c
commit 40ada2ba5a
91 changed files with 1278 additions and 1350 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
Mac/Preferences/PreferencesWindowController.swift
View File

@@ -13,7 +13,7 @@ private struct PreferencesToolbarItemSpec {
let identifier: NSToolbarItem.Identifier
let name: String
let image: NSImage?
init(identifierRawValue: String, name: String, image: NSImage?) {
self.identifier = NSToolbarItem.Identifier(identifierRawValue)
self.name = name
@@ -27,8 +27,8 @@ private struct ToolbarItemIdentifier {
static let Advanced = "Advanced"
}
class PreferencesWindowController : NSWindowController, NSToolbarDelegate {
class PreferencesWindowController: NSWindowController, NSToolbarDelegate {
private let windowWidth = CGFloat(512.0) // Width is constant for all views; only the height changes
private var viewControllers = [String: NSViewController]()
private let toolbarItemSpecs: [PreferencesToolbarItemSpec] = {
@@ -126,7 +126,7 @@ private extension PreferencesWindowController {
assertionFailure("Preferences window: no view controller matching \(identifier).")
return
}
if newViewController.view == currentView {
return
}
@@ -140,8 +140,7 @@ private extension PreferencesWindowController {
if let currentView = currentView {
window!.contentView?.replaceSubview(currentView, with: newViewController.view)
}
else {
} else {
window!.contentView?.addSubview(newViewController.view)
}
@@ -167,23 +166,23 @@ private extension PreferencesWindowController {
let viewFrame = view.frame
let windowFrame = window!.frame
let contentViewFrame = window!.contentView!.frame
let deltaHeight = NSHeight(contentViewFrame) - NSHeight(viewFrame)
let heightForWindow = NSHeight(windowFrame) - deltaHeight
let windowOriginY = NSMinY(windowFrame) + deltaHeight
let deltaHeight = contentViewFrame.height - viewFrame.height
let heightForWindow = windowFrame.height - deltaHeight
let windowOriginY = windowFrame.minY + deltaHeight
var updatedWindowFrame = windowFrame
updatedWindowFrame.size.height = heightForWindow
updatedWindowFrame.origin.y = windowOriginY
updatedWindowFrame.size.width = windowWidth //NSWidth(viewFrame)
updatedWindowFrame.size.width = windowWidth // NSWidth(viewFrame)
var updatedViewFrame = viewFrame
updatedViewFrame.origin = NSZeroPoint
updatedViewFrame.origin = NSPoint.zero
updatedViewFrame.size.width = windowWidth
if viewFrame != updatedViewFrame {
view.frame = updatedViewFrame
}
if windowFrame != updatedWindowFrame {
window!.contentView?.alphaValue = 0.0
window!.setFrame(updatedWindowFrame, display: true, animate: true)