From 708a8b3692078c1debc8b2e2e398f2d96c865697 Mon Sep 17 00:00:00 2001 From: macmade Date: Wed, 7 Nov 2018 00:10:25 +0100 Subject: [PATCH] Now display app icon when no account is selected. --- Notarize/Classes/MainWindowController.swift | 5 ++++ .../Notarize.MainWindowController.xib | 24 +++++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/Notarize/Classes/MainWindowController.swift b/Notarize/Classes/MainWindowController.swift index 8edbc58..58af23a 100644 --- a/Notarize/Classes/MainWindowController.swift +++ b/Notarize/Classes/MainWindowController.swift @@ -33,6 +33,7 @@ class MainWindowController: NSWindowController private var observations: [ NSKeyValueObservation ] = [] private var controllers: [ String : HistoryViewController ] = [ : ] + @objc private dynamic var controller: HistoryViewController? @objc private dynamic var accounts: [ Account ] = [] @objc private dynamic var altoolIsAvailable: Bool = true @@ -57,6 +58,8 @@ class MainWindowController: NSWindowController { o, c in + self.controller = nil + self.historyViewContainer.subviews.forEach { v in v.removeFromSuperview() @@ -79,6 +82,8 @@ class MainWindowController: NSWindowController return } + self.controller = controller + controller.view.translatesAutoresizingMaskIntoConstraints = false self.historyViewContainer.addSubview( controller.view ) diff --git a/Notarize/UI/Base.lproj/Notarize.MainWindowController.xib b/Notarize/UI/Base.lproj/Notarize.MainWindowController.xib index a3e2661..7be64f7 100644 --- a/Notarize/UI/Base.lproj/Notarize.MainWindowController.xib +++ b/Notarize/UI/Base.lproj/Notarize.MainWindowController.xib @@ -238,13 +238,37 @@ + + + + + + + + + + + NSIsNotNil + + + + + + + + NSIsNil + + + + +