From a6411c7afa0f8dd4e0242be894d01f8c005e8259 Mon Sep 17 00:00:00 2001 From: Nate Weaver Date: Wed, 8 Apr 2020 16:42:13 -0500 Subject: [PATCH] Check for semibold base font before changing bold text to heavy --- .../Cell/NSAttributedString+NetNewsWire.swift | 24 ++++++++++++------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/Mac/MainWindow/Timeline/Cell/NSAttributedString+NetNewsWire.swift b/Mac/MainWindow/Timeline/Cell/NSAttributedString+NetNewsWire.swift index 6be8a0501..cfd60ce3c 100644 --- a/Mac/MainWindow/Timeline/Cell/NSAttributedString+NetNewsWire.swift +++ b/Mac/MainWindow/Timeline/Cell/NSAttributedString+NetNewsWire.swift @@ -20,25 +20,31 @@ extension NSAttributedString { let size = baseFont.pointSize let baseDescriptor = baseFont.fontDescriptor - let traits = baseDescriptor.symbolicTraits + let symbolicTraits = baseDescriptor.symbolicTraits mutable.enumerateAttribute(.font, in: fullRange, options: []) { (font: Any?, range: NSRange, stop: UnsafeMutablePointer) in guard let font = font as? NSFont else { return } - var newTraits = traits + var newSymbolicTraits = symbolicTraits if font.fontDescriptor.symbolicTraits.contains(.italic) { - newTraits.insert(.italic) + newSymbolicTraits.insert(.italic) } - var descriptor = baseDescriptor.withSymbolicTraits(newTraits) + var descriptor = baseDescriptor.withSymbolicTraits(newSymbolicTraits) if font.fontDescriptor.symbolicTraits.contains(.bold) { - // This currently assumes we're modifying the title field, which is - // already semibold. - let traits: [NSFontDescriptor.TraitKey: Any] = [.weight: NSFont.Weight.heavy] - let attributes: [NSFontDescriptor.AttributeName: Any] = [.traits: traits] - descriptor = descriptor.addingAttributes(attributes) + 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. + + if baseWeight == .semibold { + let traits: [NSFontDescriptor.TraitKey: Any] = [.weight: NSFont.Weight.heavy] + let attributes: [NSFontDescriptor.AttributeName: Any] = [.traits: traits] + descriptor = descriptor.addingAttributes(attributes) + } } let newFont = NSFont(descriptor: descriptor, size: size)