From ecbd51af538f7cda0217c2cfc1a9eb9df29242dc Mon Sep 17 00:00:00 2001 From: Chris Zielinski Date: Tue, 9 Oct 2018 20:23:43 -0700 Subject: [PATCH] Fix Auto Layout satisfiability (#5) --- Sources/Preferences/PreferencesWindowController.swift | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/Sources/Preferences/PreferencesWindowController.swift b/Sources/Preferences/PreferencesWindowController.swift index 1975b2c..a97196e 100644 --- a/Sources/Preferences/PreferencesWindowController.swift +++ b/Sources/Preferences/PreferencesWindowController.swift @@ -18,18 +18,17 @@ public final class PreferencesWindowController: NSWindowController { super.init(window: window) window.title = String(System.localizedString(forKey: "Preferences…").dropLast()) - - tabViewController.tabStyle = .toolbar - tabViewController.transitionOptions = [.crossfade, .slideDown] window.contentView = tabViewController.view - for viewController in viewControllers { + tabViewController.tabViewItems = viewControllers.map { viewController in let item = NSTabViewItem(identifier: viewController.toolbarItemTitle) item.label = viewController.toolbarItemTitle item.image = viewController.toolbarItemIcon item.viewController = viewController as? NSViewController - tabViewController.addTabViewItem(item) + return item } + tabViewController.tabStyle = .toolbar + tabViewController.transitionOptions = [.crossfade, .slideDown] } public required init?(coder: NSCoder) {