From 2325e7edbce2b593911a9b733e625cdd42a9356c Mon Sep 17 00:00:00 2001 From: Brent Simmons Date: Sat, 17 Feb 2018 18:22:57 -0800 Subject: [PATCH] Move the isOpen property from specific window controllers to the NSWindowController extension in RSCore. --- Evergreen/Inspector/InspectorWindowController.swift | 4 ---- Evergreen/MainWindow/MainWindowController.swift | 4 ---- .../RSCore/RSCore/AppKit/NSWindowController+RSCore.swift | 5 +++++ 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/Evergreen/Inspector/InspectorWindowController.swift b/Evergreen/Inspector/InspectorWindowController.swift index 0b965024e..c350b6b18 100644 --- a/Evergreen/Inspector/InspectorWindowController.swift +++ b/Evergreen/Inspector/InspectorWindowController.swift @@ -32,10 +32,6 @@ final class InspectorWindowController: NSWindowController { } } - var isOpen: Bool { - return isWindowLoaded && window!.isVisible - } - private var inspectors: [InspectorViewController]! private var currentInspector: InspectorViewController! { diff --git a/Evergreen/MainWindow/MainWindowController.swift b/Evergreen/MainWindow/MainWindowController.swift index 73b260216..a9f93c8fd 100644 --- a/Evergreen/MainWindow/MainWindowController.swift +++ b/Evergreen/MainWindow/MainWindowController.swift @@ -16,10 +16,6 @@ private let kWindowFrameKey = "MainWindow" class MainWindowController : NSWindowController, NSUserInterfaceValidations { - var isOpen: Bool { - return isWindowLoaded && window!.isVisible - } - // MARK: NSWindowController private let windowAutosaveName = NSWindow.FrameAutosaveName(rawValue: kWindowFrameKey) diff --git a/Frameworks/RSCore/RSCore/AppKit/NSWindowController+RSCore.swift b/Frameworks/RSCore/RSCore/AppKit/NSWindowController+RSCore.swift index f35bc9f18..61cdc263e 100644 --- a/Frameworks/RSCore/RSCore/AppKit/NSWindowController+RSCore.swift +++ b/Frameworks/RSCore/RSCore/AppKit/NSWindowController+RSCore.swift @@ -14,4 +14,9 @@ public extension NSWindowController { return window?.isDisplayingSheet ?? false } + + public var isOpen: Bool { + + return isWindowLoaded && window!.isVisible + } }