From a74e0762e7a40a8fee5fb2473fa924ab21c4ab52 Mon Sep 17 00:00:00 2001 From: Brent Simmons Date: Sun, 10 Feb 2019 20:51:28 -0800 Subject: [PATCH] =?UTF-8?q?Simplify=20the=20view=20hierarchy=20for=20the?= =?UTF-8?q?=20detail=20view=20=E2=80=94=C2=A0remove=20one=20unneeded=20vie?= =?UTF-8?q?w.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- NetNewsWire/Base.lproj/MainWindow.storyboard | 55 ++++++++----------- .../Detail/DetailViewController.swift | 11 ++-- 2 files changed, 26 insertions(+), 40 deletions(-) diff --git a/NetNewsWire/Base.lproj/MainWindow.storyboard b/NetNewsWire/Base.lproj/MainWindow.storyboard index 6cea16ac8..a92cf5c20 100644 --- a/NetNewsWire/Base.lproj/MainWindow.storyboard +++ b/NetNewsWire/Base.lproj/MainWindow.storyboard @@ -517,52 +517,41 @@ - + - - + - - - - + + + + + + diff --git a/NetNewsWire/MainWindow/Detail/DetailViewController.swift b/NetNewsWire/MainWindow/Detail/DetailViewController.swift index 97bcdb0ef..aee0eaad6 100644 --- a/NetNewsWire/MainWindow/Detail/DetailViewController.swift +++ b/NetNewsWire/MainWindow/Detail/DetailViewController.swift @@ -225,7 +225,7 @@ private extension DetailViewController { } } -// MARK: - +// MARK: - DetailContainerView final class DetailContainerView: NSView { @@ -235,9 +235,10 @@ final class DetailContainerView: NSView { var contentView: NSView? { didSet { - if let oldContentView = oldValue { - oldContentView.removeFromSuperviewWithoutNeedingDisplay() + if contentView == oldValue { + return } + oldValue?.removeFromSuperviewWithoutNeedingDisplay() if let contentView = contentView { contentView.translatesAutoresizingMaskIntoConstraints = false addSubview(contentView, positioned: .below, relativeTo: detailStatusBarView) @@ -247,12 +248,10 @@ final class DetailContainerView: NSView { } override func viewWillStartLiveResize() { - viewController?.viewWillStartLiveResize() } override func viewDidEndLiveResize() { - viewController?.viewDidEndLiveResize() } @@ -260,8 +259,6 @@ final class DetailContainerView: NSView { NSColor.textBackgroundColor.setFill() dirtyRect.fill() } - - } // MARK: -