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

Fix crashing bug by not using an NSFont as a key in a Swift dictionary. Fix #734.

Browse Source
This commit is contained in:
Brent Simmons 2019-06-09 16:03:08 -07:00
parent 941dd5fa08
commit 4a4fa6ed0e
1 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
Mac/MainWindow/Timeline/Cell/SingleLineTextFieldSizer.swift
View File

@ -18,15 +18,18 @@ final class SingleLineTextFieldSizer {
private let textField: NSTextField private let textField: NSTextField
private var cache = [String: NSSize]() private var cache = [String: NSSize]()
init(font: NSFont) { /// Get the NSTextField size for text, given a font.
static func size(for text: String, font: NSFont) -> NSSize {
return sizer(for: font).size(for: text)
}
init(font: NSFont) {
self.textField = NSTextField(labelWithString: "") self.textField = NSTextField(labelWithString: "")
self.textField.font = font self.textField.font = font
self.font = font self.font = font
} }
func size(for text: String) -> NSSize { func size(for text: String) -> NSSize {
if let cachedSize = cache[text] { if let cachedSize = cache[text] {
return cachedSize return cachedSize
} }
@ -40,29 +43,23 @@ final class SingleLineTextFieldSizer {
return calculatedSize return calculatedSize
} }
static private var sizers = [NSFont: SingleLineTextFieldSizer]() static private var sizers = [SingleLineTextFieldSizer]()
static func sizer(for font: NSFont) -> SingleLineTextFieldSizer { static private func sizer(for font: NSFont) -> SingleLineTextFieldSizer {
// We used to use an [NSFont: SingleLineTextFieldSizer] dictionary —
if let cachedSizer = sizers[font] { // until, in 10.14.5, we started getting crashes with the message:
// Fatal error: Duplicate keys of type 'NSFont' were found in a Dictionary.
// This usually means either that the type violates Hashable's requirements, or
// that members of such a dictionary were mutated after insertion.
// We use just an array of sizers now — which is totally fine,
// because there’s only going to be like three of them.
if let cachedSizer = sizers.firstElementPassingTest({ $0.font == font }) {
return cachedSizer return cachedSizer
} }
let newSizer = SingleLineTextFieldSizer(font: font) let newSizer = SingleLineTextFieldSizer(font: font)
sizers[font] = newSizer sizers.append(newSizer)
return newSizer return newSizer
} }
// Use this call. It’s easiest.
static func size(for text: String, font: NSFont) -> NSSize {
return sizer(for: font).size(for: text)
}
static func emptyCache() {
sizers = [NSFont: SingleLineTextFieldSizer]()
}
} }