From 57542592cb0f7f6b53ec8611ddf84d9393ae29f2 Mon Sep 17 00:00:00 2001 From: Maurice Parker Date: Wed, 11 Sep 2019 17:47:02 -0500 Subject: [PATCH 1/2] Correct which view should become the first responder. Issue #1014 --- Mac/MainWindow/Detail/DetailViewController.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Mac/MainWindow/Detail/DetailViewController.swift b/Mac/MainWindow/Detail/DetailViewController.swift index a7a8ce63a..c1d26e512 100644 --- a/Mac/MainWindow/Detail/DetailViewController.swift +++ b/Mac/MainWindow/Detail/DetailViewController.swift @@ -68,10 +68,10 @@ final class DetailViewController: NSViewController, WKUIDelegate { func focus() { - guard let window = currentWebViewController.view.window else { + guard let window = currentWebViewController.webView.window else { return } - window.makeFirstResponderUnlessDescendantIsFirstResponder(currentWebViewController.view) + window.makeFirstResponderUnlessDescendantIsFirstResponder(currentWebViewController.webView) } } From 744d43ddd960c4108ac9e9f986c2ed193f6c779c Mon Sep 17 00:00:00 2001 From: Brent Simmons Date: Wed, 11 Sep 2019 22:26:09 -0700 Subject: [PATCH 2/2] Bump version to 5.0. --- xcconfig/NetNewsWire_target.xcconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xcconfig/NetNewsWire_target.xcconfig b/xcconfig/NetNewsWire_target.xcconfig index c3d4b1175..7b3d155e8 100644 --- a/xcconfig/NetNewsWire_target.xcconfig +++ b/xcconfig/NetNewsWire_target.xcconfig @@ -29,8 +29,8 @@ PROVISIONING_PROFILE_SPECIFIER = #include? "../../SharedXcodeSettings/DeveloperSettings.xcconfig" // High Level Settings common to both the Mac application and any extensions we bundle with it -MARKETING_VERSION = 5.0.1b1 -CURRENT_PROJECT_VERSION = 2613 +MARKETING_VERSION = 5.0.1 +CURRENT_PROJECT_VERSION = 2614 ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES COMBINE_HIDPI_IMAGES = YES