aboutsummaryrefslogtreecommitdiffstats
path: root/WireGuard
diff options
context:
space:
mode:
Diffstat (limited to 'WireGuard')
-rw-r--r--WireGuard/WireGuard/UI/macOS/View/ConfTextColorTheme.swift14
-rw-r--r--WireGuard/WireGuard/UI/macOS/View/ConfTextStorage.swift11
2 files changed, 22 insertions, 3 deletions
diff --git a/WireGuard/WireGuard/UI/macOS/View/ConfTextColorTheme.swift b/WireGuard/WireGuard/UI/macOS/View/ConfTextColorTheme.swift
index e633bdf8..b258f8b5 100644
--- a/WireGuard/WireGuard/UI/macOS/View/ConfTextColorTheme.swift
+++ b/WireGuard/WireGuard/UI/macOS/View/ConfTextColorTheme.swift
@@ -4,10 +4,16 @@
import Cocoa
protocol ConfTextColorTheme {
+ var defaultColor: NSColor { get }
+
func color(for: highlight_type) -> NSColor
}
struct ConfTextAquaColorTheme: ConfTextColorTheme {
+ var defaultColor: NSColor {
+ return NSColor(hex: "#000000") // Plain text in Xcode
+ }
+
func color(for highlightType: highlight_type) -> NSColor {
switch highlightType.rawValue {
case HighlightSection.rawValue:
@@ -27,12 +33,16 @@ struct ConfTextAquaColorTheme: ConfTextColorTheme {
case HighlightError.rawValue:
return NSColor(hex: "#C41A16") // Strings in Xcode
default:
- return NSColor(hex: "#000000") // Plain text in Xcode
+ return defaultColor
}
}
}
struct ConfTextDarkAquaColorTheme: ConfTextColorTheme {
+ var defaultColor: NSColor {
+ return NSColor(hex: "#FFFFFF") // Plain text in Xcode
+ }
+
func color(for highlightType: highlight_type) -> NSColor {
switch highlightType.rawValue {
case HighlightSection.rawValue:
@@ -52,7 +62,7 @@ struct ConfTextDarkAquaColorTheme: ConfTextColorTheme {
case HighlightError.rawValue:
return NSColor(hex: "#FF4C4C") // Strings in Xcode
default:
- return NSColor(hex: "#FFFFFF") // Plain text in Xcode
+ return defaultColor
}
}
}
diff --git a/WireGuard/WireGuard/UI/macOS/View/ConfTextStorage.swift b/WireGuard/WireGuard/UI/macOS/View/ConfTextStorage.swift
index 0a38d4ef..511a35cf 100644
--- a/WireGuard/WireGuard/UI/macOS/View/ConfTextStorage.swift
+++ b/WireGuard/WireGuard/UI/macOS/View/ConfTextStorage.swift
@@ -85,7 +85,16 @@ class ConfTextStorage: NSTextStorage {
hasError = false
privateKeyString = nil
+ let fullTextRange = NSRange(location: 0, length: (backingStore.string as NSString).length)
+
backingStore.beginEditing()
+ if let textColorTheme = textColorTheme {
+ let defaultAttributes: [NSAttributedString.Key: Any] = [
+ .foregroundColor: textColorTheme.defaultColor,
+ .font: defaultFont
+ ]
+ backingStore.setAttributes(defaultAttributes, range: fullTextRange)
+ }
var spans = highlight_config(backingStore.string.cString(using: String.Encoding.utf8))!
while spans.pointee.type != HighlightEnd {
@@ -111,7 +120,7 @@ class ConfTextStorage: NSTextStorage {
backingStore.endEditing()
beginEditing()
- edited(.editedAttributes, range: NSRange(location: 0, length: (backingStore.string as NSString).length), changeInLength: 0)
+ edited(.editedAttributes, range: fullTextRange, changeInLength: 0)
endEditing()
}