From 688b24f18ef9995e7a8aae355a06248a9bb712e0 Mon Sep 17 00:00:00 2001 From: Nate Weaver Date: Fri, 1 May 2020 01:56:19 -0500 Subject: [PATCH] Swap baseDescriptor and currentDescriptor to allow semibold to come through --- Shared/Extensions/NSAttributedString+NetNewsWire.swift | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/Shared/Extensions/NSAttributedString+NetNewsWire.swift b/Shared/Extensions/NSAttributedString+NetNewsWire.swift index 090b0d1e4..4037b2489 100644 --- a/Shared/Extensions/NSAttributedString+NetNewsWire.swift +++ b/Shared/Extensions/NSAttributedString+NetNewsWire.swift @@ -46,18 +46,16 @@ extension NSAttributedString { guard let font = font as? Font else { return } let currentDescriptor = font.fontDescriptor - let symbolicTraits = font.fontDescriptor.symbolicTraits - let newSymbolicTraits = baseSymbolicTraits.union(symbolicTraits) + let symbolicTraits = baseSymbolicTraits.union(currentDescriptor.symbolicTraits) - var descriptor = baseDescriptor.addingAttributes(currentDescriptor.fontAttributes) + var descriptor = currentDescriptor.addingAttributes(baseDescriptor.fontAttributes) #if canImport(AppKit) - descriptor = descriptor.withSymbolicTraits(newSymbolicTraits) + descriptor = descriptor.withSymbolicTraits(symbolicTraits) #else - descriptor = descriptor.withSymbolicTraits(newSymbolicTraits)! + descriptor = descriptor.withSymbolicTraits(symbolicTraits)! #endif - let newFont = Font(descriptor: descriptor, size: size) mutable.addAttribute(.font, value: newFont as Any, range: range)