From 0d26585ab166e0ddac90966ad1996267000f18ec Mon Sep 17 00:00:00 2001 From: LEOYoon-Tsaw Date: Mon, 5 Apr 2021 11:13:20 -0400 Subject: [PATCH] optimize `fixDefaultFont` code --- SquirrelPanel.m | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/SquirrelPanel.m b/SquirrelPanel.m index c8514ff25..cedf9bcd3 100644 --- a/SquirrelPanel.m +++ b/SquirrelPanel.m @@ -751,13 +751,10 @@ void fixDefaultFont(NSMutableAttributedString *text, NSSet *fonts) { NSRange currentFontRange = NSMakeRange(NSNotFound, 0); long i = 0; while (i < text.length) { - NSDictionary *charAttr = [text attributesAtIndex:i effectiveRange:¤tFontRange]; - NSFont *charFont = charAttr[NSFontAttributeName]; + NSFont *charFont = [text attributesAtIndex:i effectiveRange:¤tFontRange][NSFontAttributeName]; if (![fonts containsObject:charFont]) { - NSMutableDictionary *defaultAttributes = [charAttr mutableCopy]; NSFont *defaultFont = [NSFont systemFontOfSize:charFont.pointSize]; - [defaultAttributes setValue:defaultFont forKey:NSFontAttributeName]; - [text setAttributes:defaultAttributes range:currentFontRange]; + [text addAttribute:NSFontAttributeName value:defaultFont range:currentFontRange]; } i = currentFontRange.location + currentFontRange.length; }