Fix all known issue with Dark mode

griff · Mar 12, 2020 · ed6b74a · ed6b74a
1 parent c5b6138
commit ed6b74a
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 3 deletions.
diff --git a/App/Base.lproj/MainMenu.xib b/App/Base.lproj/MainMenu.xib
@@ -447,7 +447,7 @@ CA
                                                         <rect key="frame" x="0.0" y="0.0" width="334" height="457"/>
                                                         <autoresizingMask key="autoresizingMask"/>
                                                         <size key="intercellSpacing" width="3" height="2"/>
-                                                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+                                                        <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
                                                         <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
                                                         <tableColumns>
                                                             <tableColumn identifier="status" editable="NO" width="20" minWidth="20" maxWidth="20" id="1897">

diff --git a/App/Base.lproj/Queue.xib b/App/Base.lproj/Queue.xib
@@ -138,7 +138,7 @@
                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                                             <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="503 of 575 MB - stopped" id="211">
                                                 <font key="font" metaFont="miniSystem"/>
-                                                <color key="textColor" name="controlShadowColor" catalog="System" colorSpace="catalog"/>
+                                                <color key="textColor" name="secondaryLabelColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                             </textFieldCell>
                                             <connections>
@@ -207,7 +207,7 @@
                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                                             <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="503 of 575 MB - stopped" id="220">
                                                 <font key="font" metaFont="miniSystem"/>
-                                                <color key="textColor" name="controlShadowColor" catalog="System" colorSpace="catalog"/>
+                                                <color key="textColor" name="secondaryLabelColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                             </textFieldCell>
                                             <connections>

diff --git a/App/src/MZTextView.m b/App/src/MZTextView.m
@@ -243,6 +243,22 @@ - (void)objectDidEndEditing:(id)theEditor
 
 @implementation MZTextView
 
+-(void)setString:(NSString *)string
+{
+    NSDictionary<NSAttributedStringKey, id>* defaultAttribute =
+        [NSDictionary dictionaryWithObjectsAndKeys:
+            NSColor.textColor, NSForegroundColorAttributeName,
+         nil];
+
+    NSAttributedString* attributedText = [[NSAttributedString alloc] initWithString:string attributes:defaultAttribute];
+    [self.textStorage setAttributedString:attributedText];
+}
+
+- (NSString *)string
+{
+    return self.textStorage.string;
+}
+
 - (void)bind:(NSString *)binding toObject:(id)observableController
         withKeyPath:(NSString *)keyPath
             options:(NSDictionary *)options