From e18a9568753429460f15b19bab827222853c5dca Mon Sep 17 00:00:00 2001 From: Eryn Wells Date: Sat, 3 Nov 2018 15:05:27 -0400 Subject: [PATCH] Create the TerrainVC in the xib --- Terrain/AppDelegate.swift | 4 ++-- Terrain/Base.lproj/MainMenu.xib | 16 ++++++++++------ 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/Terrain/AppDelegate.swift b/Terrain/AppDelegate.swift index 8c57d74..29fa01e 100644 --- a/Terrain/AppDelegate.swift +++ b/Terrain/AppDelegate.swift @@ -12,10 +12,10 @@ import Cocoa class AppDelegate: NSObject, NSApplicationDelegate { @IBOutlet weak var window: NSWindow! + @IBOutlet weak var terrainViewController: TerrainViewController! func applicationDidFinishLaunching(_ aNotification: Notification) { - let terrainVC = TerrainViewController() - window.contentViewController = terrainVC + window.contentViewController = terrainViewController window.makeKeyAndOrderFront(nil) } diff --git a/Terrain/Base.lproj/MainMenu.xib b/Terrain/Base.lproj/MainMenu.xib index 9ec4fa2..59b6a22 100644 --- a/Terrain/Base.lproj/MainMenu.xib +++ b/Terrain/Base.lproj/MainMenu.xib @@ -1,7 +1,8 @@ - - + + - + + @@ -10,9 +11,10 @@ - - + + + @@ -677,16 +679,18 @@ + - + +