From 104445c4132e01103c9ef892a1f8f091dab5e053 Mon Sep 17 00:00:00 2001 From: Brent Simmons Date: Tue, 12 Feb 2019 18:18:08 -0800 Subject: [PATCH] Move live-resize handler from detail container to DetailWebView, where it belongs. --- .../Detail/DetailViewController.swift | 18 ------------------ .../MainWindow/Detail/DetailWebView.swift | 9 +++++++++ 2 files changed, 9 insertions(+), 18 deletions(-) diff --git a/NetNewsWire/MainWindow/Detail/DetailViewController.swift b/NetNewsWire/MainWindow/Detail/DetailViewController.swift index 4d0e61b55..c00b7e630 100644 --- a/NetNewsWire/MainWindow/Detail/DetailViewController.swift +++ b/NetNewsWire/MainWindow/Detail/DetailViewController.swift @@ -108,16 +108,6 @@ final class DetailViewController: NSViewController, WKUIDelegate { let timelineArticles = userInfo[UserInfoKey.articles] as? ArticleArray articles = timelineArticles } - - func viewWillStartLiveResize() { - - webview.evaluateJavaScript("document.body.style.overflow = 'hidden';", completionHandler: nil) - } - - func viewDidEndLiveResize() { - - webview.evaluateJavaScript("document.body.style.overflow = 'visible';", completionHandler: nil) - } } // MARK: WKNavigationDelegate @@ -236,14 +226,6 @@ final class DetailContainerView: NSView { } } - override func viewWillStartLiveResize() { - viewController?.viewWillStartLiveResize() - } - - override func viewDidEndLiveResize() { - viewController?.viewDidEndLiveResize() - } - override func draw(_ dirtyRect: NSRect) { NSColor.textBackgroundColor.setFill() dirtyRect.fill() diff --git a/NetNewsWire/MainWindow/Detail/DetailWebView.swift b/NetNewsWire/MainWindow/Detail/DetailWebView.swift index a23634d0d..1ce082904 100644 --- a/NetNewsWire/MainWindow/Detail/DetailWebView.swift +++ b/NetNewsWire/MainWindow/Detail/DetailWebView.swift @@ -36,6 +36,15 @@ final class DetailWebView: WKWebView { evaluateJavaScript("document.getElementById('bodyId').className = '\(bodyClass)'") } + override func viewWillStartLiveResize() { + super.viewWillStartLiveResize() + evaluateJavaScript("document.body.style.overflow = 'hidden';", completionHandler: nil) + } + + override func viewDidEndLiveResize() { + super.viewDidEndLiveResize() + evaluateJavaScript("document.body.style.overflow = 'visible';", completionHandler: nil) + } } private extension NSUserInterfaceItemIdentifier {