WIP: Fix preferences window not appearing when the content views are not using auto-layout

Sources/Preferences/PreferencePane.swift

@@ -1,6 +1,6 @@
 import Cocoa
 
-public struct PreferencePaneIdentifier: Hashable, RawRepresentable, Codable {
+public struct PreferencePaneIdentifier: Hashable, RawRepresentable {
  public typealias Identifier = PreferencePaneIdentifier
 
  public let rawValue: String

Sources/Preferences/PreferencesTabViewController.swift

@@ -11,9 +11,11 @@ final class PreferencesTabViewController: NSViewController, PreferencesStyleCont
  preferencesStyleController?.toolbarItemIdentifiers() ?? []
  }
 
- var window: NSWindow! { view.window }
+ private var viewSizeCache = [PreferencePaneIdentifier: CGSize]()
 
- var isAnimated: Bool = true
+ var window: NSWindow! {
+ return view.window
+ }
 
  override func loadView() {
  self.view = NSView()
@@ -63,6 +65,7 @@ final class PreferencesTabViewController: NSViewController, PreferencesStyleCont
  activeTab = index
  preferencesStyleController.selectTab(index: index)
  updateWindowTitle(tabIndex: index)
+ setWindowFrame(for: preferencePanes[index].viewController, animated: animated)
  }
 
  if activeTab == nil {
@@ -111,24 +114,19 @@ final class PreferencesTabViewController: NSViewController, PreferencesStyleCont
  return
  }
 
- let fromViewController = preferencePanes[activeTab]
- let toViewController = preferencePanes[index]
-
- // View controller animations only work on macOS 10.14 and newer.
- let options: NSViewController.TransitionOptions
- if #available(macOS 10.14, *) {
- options = animated && isAnimated ? [.crossfade] : []
- } else {
- options = []
- }
+ let fromViewController = children[activeTab]
+ let toViewController = children[index]
 
  view.removeConstraints(activeChildViewConstraints)
 
+ fromViewController.view.layer?.opacity = 0
+ toViewController.view.layer?.opacity = 0
  transition(
  from: fromViewController,
  to: toViewController,
- options: options
+ options: []
  ) {
+ toViewController.view.layer?.opacity = 1
  self.activeChildViewConstraints = toViewController.view.constrainToSuperviewBounds()
  }
  }
@@ -139,48 +137,30 @@ final class PreferencesTabViewController: NSViewController, PreferencesStyleCont
  options: NSViewController.TransitionOptions = [],
  completionHandler completion: (() -> Void)? = nil
  ) {
- let isAnimated = options
- .intersection([
- .crossfade,
- .slideUp,
- .slideDown,
- .slideForward,
- .slideBackward,
- .slideLeft,
- .slideRight
- ])
- .isEmpty == false
-
- if isAnimated {
- NSAnimationContext.runAnimationGroup({ context in
- context.allowsImplicitAnimation = true
- context.duration = 0.25
- context.timingFunction = CAMediaTimingFunction(name: .easeInEaseOut)
- setWindowFrame(for: toViewController, animated: true)
-
- super.transition(
- from: fromViewController,
- to: toViewController,
- options: options,
- completionHandler: completion
- )
- }, completionHandler: nil)
- } else {
- super.transition(
- from: fromViewController,
- to: toViewController,
- options: options,
- completionHandler: completion
- )
- }
+ super.transition(
+ from: fromViewController,
+ to: toViewController,
+ options: [],
+ completionHandler: completion
+ )
  }
 
  private func setWindowFrame(for viewController: NSViewController, animated: Bool = false) {
- guard let window = window else {
+ guard
+ let window = window,
+ let preferencePane = preferencePanes.first(where: { $0.viewController == viewController })
+ else {
  preconditionFailure()
  }
 
- let contentSize = viewController.view.fittingSize
+ var contentSize = CGSize.zero
+ if let cachedSize = self.viewSizeCache[preferencePane.preferencePaneIdentifier] {
+ contentSize = cachedSize
+ } else {
+ contentSize = viewController.view.bounds.size
+
+ self.viewSizeCache[preferencePane.preferencePaneIdentifier] = contentSize
+ }
 
  let newWindowSize = window.frameRect(forContentRect: CGRect(origin: .zero, size: contentSize)).size
  var frame = window.frame

Sources/Preferences/PreferencesWindowController.swift

@@ -7,13 +7,6 @@ extension NSWindow.FrameAutosaveName {
 public final class PreferencesWindowController: NSWindowController {
  private let tabViewController = PreferencesTabViewController()
 
- public var isAnimated: Bool {
- get { tabViewController.isAnimated }
- set {
- tabViewController.isAnimated = newValue
- }
- }
-
  public var hidesToolbarForSingleItem: Bool {
  didSet {
  updateToolbarVisibility()
@@ -54,7 +47,6 @@ public final class PreferencesWindowController: NSWindowController {
  return (preferencePanes.count <= 1) ? .visible : .hidden
  }
  }()
- tabViewController.isAnimated = animated
  tabViewController.configure(preferencePanes: preferencePanes, style: style)
  updateToolbarVisibility()
  }