From 39255a8422d43a4cd64d566857892364783ad9a2 Mon Sep 17 00:00:00 2001 From: Nate Weaver Date: Thu, 9 Apr 2020 14:01:26 -0500 Subject: [PATCH] Initialize baseWeight outside the enumeration --- .../Timeline/Cell/NSAttributedString+NetNewsWire.swift | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Mac/MainWindow/Timeline/Cell/NSAttributedString+NetNewsWire.swift b/Mac/MainWindow/Timeline/Cell/NSAttributedString+NetNewsWire.swift index cfd60ce3c..2fdc1f18e 100644 --- a/Mac/MainWindow/Timeline/Cell/NSAttributedString+NetNewsWire.swift +++ b/Mac/MainWindow/Timeline/Cell/NSAttributedString+NetNewsWire.swift @@ -22,6 +22,9 @@ extension NSAttributedString { let baseDescriptor = baseFont.fontDescriptor let symbolicTraits = baseDescriptor.symbolicTraits + let baseTraits = baseDescriptor.object(forKey: .traits) as! [NSFontDescriptor.TraitKey: Any] + let baseWeight = baseTraits[.weight] as! NSFont.Weight + mutable.enumerateAttribute(.font, in: fullRange, options: []) { (font: Any?, range: NSRange, stop: UnsafeMutablePointer) in guard let font = font as? NSFont else { return } @@ -34,9 +37,6 @@ extension NSAttributedString { var descriptor = baseDescriptor.withSymbolicTraits(newSymbolicTraits) if font.fontDescriptor.symbolicTraits.contains(.bold) { - let baseTraits = baseDescriptor.object(forKey: .traits) as! [NSFontDescriptor.TraitKey: Any] - let baseWeight = baseTraits[.weight] as! NSFont.Weight - // If the base font is semibold (as timeline titles are), make the "bold" // text heavy for better contrast.