FreshRSS
/
NetNewsWire
mirror of https://github.com/Ranchero-Software/NetNewsWire.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove the color parameter as it's no longer needed

This commit is contained in:
Nate Weaver 2020-05-01 01:44:23 -05:00
parent cc0bfd95b2
commit 37f1ebc025
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Mac/MainWindow/Timeline/Cell/TimelineTableCellView.swift
View File

@ -251,8 +251,8 @@ private extension TimelineTableCellView {
func updateTextFieldAttributedText(_ textField: NSTextField, _ text: NSAttributedString?) { func updateTextFieldAttributedText(_ textField: NSTextField, _ text: NSAttributedString?) {
var s = text ?? NSAttributedString(string: "") var s = text ?? NSAttributedString(string: "")
if let fieldFont = textField.font, let color = textField.textColor { if let fieldFont = textField.font {
s = s.adding(font: fieldFont, color: color) s = s.adding(font: fieldFont)
} }
if textField.attributedStringValue != s { if textField.attributedStringValue != s {

7
Shared/Extensions/NSAttributedString+NetNewsWire.swift
View File

@ -34,15 +34,10 @@ extension NSAttributedString {
/// ///
/// - Parameters: /// - Parameters:
/// - baseFont: The font to add. /// - baseFont: The font to add.
/// - color: The color to add. func adding(font baseFont: Font) -> NSAttributedString {
func adding(font baseFont: Font, color: Color? = nil) -> NSAttributedString {
let mutable = self.mutableCopy() as! NSMutableAttributedString let mutable = self.mutableCopy() as! NSMutableAttributedString
let fullRange = NSRange(location: 0, length: mutable.length) let fullRange = NSRange(location: 0, length: mutable.length)
if let color = color {
mutable.addAttribute(.foregroundColor, value: color as Any, range: fullRange)
}
let size = baseFont.pointSize let size = baseFont.pointSize
let baseDescriptor = baseFont.fontDescriptor let baseDescriptor = baseFont.fontDescriptor
let baseSymbolicTraits = baseDescriptor.symbolicTraits let baseSymbolicTraits = baseDescriptor.symbolicTraits