From 6acbbca23c47e24c6abd20537fcd703408dca3d0 Mon Sep 17 00:00:00 2001 From: Allan Odgaard Date: Tue, 30 Oct 2018 15:31:48 +0700 Subject: [PATCH] Use textColor and secondaryLabelColor for find in folder results --- Frameworks/Find/src/FFResultNode.mm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Frameworks/Find/src/FFResultNode.mm b/Frameworks/Find/src/FFResultNode.mm index 36be3b43..1c05ca14 100644 --- a/Frameworks/Find/src/FFResultNode.mm +++ b/Frameworks/Find/src/FFResultNode.mm @@ -80,7 +80,7 @@ static NSAttributedString* PathComponentString (std::string const& path, std::st string_builder_t builder(NSLineBreakByTruncatingMiddle); builder.push_style(@{ NSFontAttributeName: font, - NSForegroundColorAttributeName: [NSColor darkGrayColor] + NSForegroundColorAttributeName: [NSColor secondaryLabelColor] }); builder.append(to_ns(text::join(std::vector(components.begin(), components.end()), " ‣ "))); builder.append(to_ns((path::is_absolute(path) ? path::display_name(path) : path)), NSBoldFontMask); @@ -109,7 +109,7 @@ static NSAttributedString* AttributedStringForMatch (std::string const& text, si { NSFontTraitMask matchFontTraits = NSBoldFontMask; NSDictionary* matchAttributes = @{ - NSForegroundColorAttributeName: [NSColor blackColor], + NSForegroundColorAttributeName: [NSColor textColor], NSBackgroundColorAttributeName: [NSColor tmMatchedTextBackgroundColor], NSUnderlineStyleAttributeName: @(NSUnderlineStyleSingle), NSUnderlineColorAttributeName: [NSColor tmMatchedTextUnderlineColor], @@ -118,7 +118,7 @@ static NSAttributedString* AttributedStringForMatch (std::string const& text, si string_builder_t builder(NSLineBreakByTruncatingTail); builder.push_style(@{ NSFontAttributeName: font, - NSForegroundColorAttributeName: [NSColor darkGrayColor] + NSForegroundColorAttributeName: [NSColor secondaryLabelColor] }); // Ensure monospaced digits for the line number prefix @@ -334,7 +334,7 @@ static NSAttributedString* AttributedStringForMatch (std::string const& text, si string_builder_t builder(NSLineBreakByTruncatingTail); builder.append(to_ns(text::format("%zu-%zu: Range is not valid UTF-8, please contact: https://macromates.com/support", m.first, m.last)), @{ NSFontAttributeName: font, - NSForegroundColorAttributeName: [NSColor darkGrayColor] + NSForegroundColorAttributeName: [NSColor secondaryLabelColor] }); return builder.attributed_string(); }