FreshRSS/NetNewsWire
1
0
Fork 0
mirror of https://github.com/Ranchero-Software/NetNewsWire.git synced 2025-02-03 12:27:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixes #2823

Browse Source
This commit is contained in:
Stuart Breckenridge 2021-03-08 10:06:30 +08:00
parent 2e12f5a078
commit 27b9326d07
No known key found for this signature in database
GPG Key ID: ED2F112EEA9EF8A5
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Mac/MainWindow/Detail/DetailWebViewController.swift
View File

@ -116,7 +116,7 @@ final class DetailWebViewController: NSViewController, WKUIDelegate {
NotificationCenter.default.addObserver(self, selector: #selector(avatarDidBecomeAvailable(_:)), name: .AvatarDidBecomeAvailable, object: nil)
NotificationCenter.default.addObserver(self, selector: #selector(faviconDidBecomeAvailable(_:)), name: .FaviconDidBecomeAvailable, object: nil)
NotificationCenter.default.addObserver(self, selector: #selector(userDefaultsDidChange(_:)), name: UserDefaults.didChangeNotification, object: nil)
NotificationCenter.default.addObserver(self, selector: #selector(bigSurOffsetFix(_:)), name: NSWindow.didExitFullScreenNotification, object: nil)
NotificationCenter.default.addObserver(self, selector: #selector(bigSurOffsetFix(_:)), name: NSWindow.didChangeScreenNotification, object: nil)
webView.loadFileURL(ArticleRenderer.blank.url, allowingReadAccessTo: ArticleRenderer.blank.baseURL)
}
@ -142,15 +142,19 @@ final class DetailWebViewController: NSViewController, WKUIDelegate {
}
}
/// On macOS 11, when a user exits full screen, the webview's origin.y is offset by a sizeable amount. This function adjusts the height of the window height by 1pt which puts the webview back in the correct place. This is an issue with SwiftUI and AppKit.
/// On macOS 11, when a user exits full screen or zoomed mode (full screen with menu bar showing), the webview's origin.y is offset by a sizeable amount. This function adjusts the height of the window height by 1pt which puts the webview back in the correct place. This is an issue with SwiftUI and AppKit.
@objc func bigSurOffsetFix(_ note: Notification) {
if #available(macOS 11, *) {
guard var frame = self.view.window?.frame else {
print(note.name)
guard var frame = view.window?.frame else {
return
}
frame.size = NSSize(width: self.view.window!.frame.width, height: self.view.window!.frame.height - 1)
self.view.window!.setFrame(frame, display: true)
frame.size = NSSize(width: view.window!.frame.width, height: view.window!.frame.height - 1)
view.window!.setFrame(frame, display: false)
frame.size = NSSize(width: view.window!.frame.width, height: view.window!.frame.height + 1)
view.window!.setFrame(frame, display: false)
}
}
// MARK: Media Functions