From edf77624087f09decd3656adf71bc0400a17af06 Mon Sep 17 00:00:00 2001
From: Lior Halphon <LIJI32@gmail.com>
Date: Wed, 10 Jun 2020 01:10:11 +0300
Subject: [PATCH] Improved Dark Mode support, improved Hex Fiend's general
 system-native appearance

---
 Cocoa/Document.m                     |   1 -
 Cocoa/Document.xib                   |  22 +++++------
 Cocoa/GBColorCell.m                  |   8 +++-
 Cocoa/GBPreferencesWindow.m          |  20 ++++++++++
 Cocoa/Joypad~dark.png                | Bin 0 -> 6244 bytes
 Cocoa/Joypad~dark@2x.png             | Bin 0 -> 7175 bytes
 Cocoa/NSImageNamedDarkSupport.m      |  42 ++++++++++++++++++++
 Cocoa/Preferences.xib                |  10 ++---
 Cocoa/Speaker~dark.png               | Bin 0 -> 4562 bytes
 Cocoa/Speaker~dark@2x.png            | Bin 0 -> 5992 bytes
 HexFiend/HFFunctions.h               |   2 +-
 HexFiend/HFLineCountingRepresenter.m |  10 ++---
 HexFiend/HFLineCountingView.m        |  56 ++++++++++-----------------
 HexFiend/HFRepresenterTextView.m     |  18 ++++++---
 HexFiend/HFStatusBarRepresenter.m    |  44 +++++----------------
 HexFiend/HFTextRepresenter.m         |  12 ++++--
 16 files changed, 141 insertions(+), 104 deletions(-)
 create mode 100644 Cocoa/Joypad~dark.png
 create mode 100644 Cocoa/Joypad~dark@2x.png
 create mode 100644 Cocoa/NSImageNamedDarkSupport.m
 create mode 100644 Cocoa/Speaker~dark.png
 create mode 100644 Cocoa/Speaker~dark@2x.png

diff --git a/Cocoa/Document.m b/Cocoa/Document.m
index 095cfe3d..fdb7d97a 100644
--- a/Cocoa/Document.m
+++ b/Cocoa/Document.m
@@ -647,7 +647,6 @@ static void rumbleCallback(GB_gameboy_t *gb, double amp)
 {
     hex_controller = [[HFController alloc] init];
     [hex_controller setBytesPerColumn:1];
-    [hex_controller setFont:[NSFont userFixedPitchFontOfSize:12]];
     [hex_controller setEditMode:HFOverwriteMode];
     
     [hex_controller setByteArray:[[GBMemoryByteArray alloc] initWithDocument:self]];
diff --git a/Cocoa/Document.xib b/Cocoa/Document.xib
index 81ce0188..e2b0ca63 100644
--- a/Cocoa/Document.xib
+++ b/Cocoa/Document.xib
@@ -116,7 +116,7 @@
                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                         <clipView key="contentView" ambiguous="YES" drawsBackground="NO" copiesOnScroll="NO" id="EQe-Ad-L7S">
                                             <rect key="frame" x="0.0" y="0.0" width="591" height="376"/>
-                                            <autoresizingMask key="autoresizingMask"/>
+                                            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                             <subviews>
                                                 <textView ambiguous="YES" editable="NO" drawsBackground="NO" importsGraphics="NO" richText="NO" verticallyResizable="YES" baseWritingDirection="leftToRight" findStyle="bar" allowsNonContiguousLayout="YES" id="doS-dM-hnl">
                                                     <rect key="frame" x="0.0" y="0.0" width="591" height="376"/>
@@ -153,7 +153,7 @@
                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                                         <clipView key="contentView" ambiguous="YES" drawsBackground="NO" copiesOnScroll="NO" id="YHx-TM-zIC">
                                             <rect key="frame" x="0.0" y="0.0" width="329" height="47"/>
-                                            <autoresizingMask key="autoresizingMask"/>
+                                            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                             <subviews>
                                                 <textView ambiguous="YES" drawsBackground="NO" importsGraphics="NO" richText="NO" verticallyResizable="YES" allowsCharacterPickerTouchBarItem="NO" allowsUndo="YES" allowsNonContiguousLayout="YES" textCompletion="NO" spellingCorrection="YES" id="w0g-eK-jM4">
                                                     <rect key="frame" x="0.0" y="0.0" width="329" height="47"/>
@@ -187,7 +187,7 @@
                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                         <clipView key="contentView" ambiguous="YES" drawsBackground="NO" copiesOnScroll="NO" id="Cs9-3x-ATg">
                                             <rect key="frame" x="0.0" y="0.0" width="329" height="328"/>
-                                            <autoresizingMask key="autoresizingMask"/>
+                                            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                             <subviews>
                                                 <textView ambiguous="YES" editable="NO" drawsBackground="NO" importsGraphics="NO" richText="NO" verticallyResizable="YES" baseWritingDirection="leftToRight" findStyle="bar" allowsNonContiguousLayout="YES" spellingCorrection="YES" id="JgV-7E-iwp">
                                                     <rect key="frame" x="0.0" y="0.0" width="329" height="328"/>
@@ -339,7 +339,7 @@
                         <font key="font" metaFont="system"/>
                         <tabViewItems>
                             <tabViewItem label="Tileset" identifier="1" id="pXb-od-Wb1">
-                                <view key="view" ambiguous="YES" id="lCG-Gt-XMF">
+                                <view key="view" id="lCG-Gt-XMF">
                                     <rect key="frame" x="0.0" y="0.0" width="512" height="408"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <subviews>
@@ -505,9 +505,9 @@
                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                             <clipView key="contentView" ambiguous="YES" drawsBackground="NO" id="3VT-AA-xVT">
                                                 <rect key="frame" x="0.0" y="0.0" width="512" height="408"/>
-                                                <autoresizingMask key="autoresizingMask"/>
+                                                <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                 <subviews>
-                                                    <tableView appearanceType="vibrantLight" verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="none" alternatingRowBackgroundColors="YES" columnReordering="NO" columnResizing="NO" multipleSelection="NO" autosaveColumns="NO" typeSelect="NO" rowHeight="18" headerView="of1-KC-dXC" id="TOc-XJ-w9w">
+                                                    <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="none" alternatingRowBackgroundColors="YES" columnReordering="NO" columnResizing="NO" multipleSelection="NO" autosaveColumns="NO" typeSelect="NO" rowHeight="18" headerView="of1-KC-dXC" id="TOc-XJ-w9w">
                                                         <rect key="frame" x="0.0" y="0.0" width="512" height="391"/>
                                                         <autoresizingMask key="autoresizingMask"/>
                                                         <size key="intercellSpacing" width="3" height="2"/>
@@ -640,7 +640,7 @@
                                 </view>
                             </tabViewItem>
                             <tabViewItem label="Palettes" identifier="" id="vLb-Nh-UYE">
-                                <view key="view" id="qIg-ci-WTA">
+                                <view key="view" ambiguous="YES" id="qIg-ci-WTA">
                                     <rect key="frame" x="0.0" y="0.0" width="512" height="408"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <subviews>
@@ -649,7 +649,7 @@
                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                             <clipView key="contentView" ambiguous="YES" id="bP9-su-zQw">
                                                 <rect key="frame" x="0.0" y="0.0" width="512" height="408"/>
-                                                <autoresizingMask key="autoresizingMask"/>
+                                                <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                 <subviews>
                                                     <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnReordering="NO" columnResizing="NO" multipleSelection="NO" autosaveColumns="NO" typeSelect="NO" rowHeight="18" id="gfC-d3-dmq">
                                                         <rect key="frame" x="0.0" y="0.0" width="512" height="408"/>
@@ -800,7 +800,7 @@
             <point key="canvasLocation" x="-159" y="356"/>
         </window>
         <button verticalHuggingPriority="750" id="RLc-0I-sYZ">
-            <rect key="frame" x="0.5" y="0.0" width="48" height="25"/>
+            <rect key="frame" x="0.0" y="0.0" width="48" height="25"/>
             <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
             <buttonCell key="cell" type="roundTextured" title="Save" bezelStyle="texturedRounded" alignment="center" controlSize="mini" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="shw-MJ-B3T">
                 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
@@ -896,7 +896,7 @@
                                 </connections>
                             </textField>
                             <button verticalHuggingPriority="750" id="C3V-Ep-bMj">
-                                <rect key="frame" x="202.5" y="12" width="82" height="23"/>
+                                <rect key="frame" x="203" y="12" width="82" height="23"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                 <buttonCell key="cell" type="roundTextured" title="Import" bezelStyle="texturedRounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="mMP-KW-YNy">
                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
@@ -970,7 +970,7 @@
                         <autoresizingMask key="autoresizingMask" flexibleMinX="YES" heightSizable="YES"/>
                         <clipView key="contentView" id="mzf-yu-RID">
                             <rect key="frame" x="1" y="0.0" width="398" height="274"/>
-                            <autoresizingMask key="autoresizingMask"/>
+                            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             <subviews>
                                 <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="none" alternatingRowBackgroundColors="YES" columnReordering="NO" columnResizing="NO" multipleSelection="NO" emptySelection="NO" autosaveColumns="NO" typeSelect="NO" headerView="pvX-uJ-qK5" id="tA3-8T-bxb">
                                     <rect key="frame" x="0.0" y="0.0" width="398" height="249"/>
diff --git a/Cocoa/GBColorCell.m b/Cocoa/GBColorCell.m
index afbbc8d1..0ad102a6 100644
--- a/Cocoa/GBColorCell.m
+++ b/Cocoa/GBColorCell.m
@@ -13,8 +13,14 @@ static inline double scale_channel(uint8_t x)
 
 - (void)setObjectValue:(id)objectValue
 {
+    
     _integerValue = [objectValue integerValue];
-    super.objectValue = [NSString stringWithFormat:@"$%04x", (uint16_t)(_integerValue & 0x7FFF)];
+    uint8_t r = _integerValue & 0x1F,
+            g = (_integerValue >> 5) & 0x1F,
+            b = (_integerValue >> 10) & 0x1F;
+    super.objectValue = [[NSAttributedString alloc] initWithString:[NSString stringWithFormat:@"$%04x", (uint16_t)(_integerValue & 0x7FFF)] attributes:@{
+        NSForegroundColorAttributeName: r * 3 + g * 4 + b * 2 > 120? [NSColor blackColor] : [NSColor whiteColor]
+    }];
 }
 
 - (NSInteger)integerValue
diff --git a/Cocoa/GBPreferencesWindow.m b/Cocoa/GBPreferencesWindow.m
index 31eebde5..aa219d86 100644
--- a/Cocoa/GBPreferencesWindow.m
+++ b/Cocoa/GBPreferencesWindow.m
@@ -164,6 +164,20 @@
     return GBGameBoyButtonCount;
 }
 
+- (unsigned) usesForKey:(unsigned) key
+{
+    unsigned ret = 0;
+    for (unsigned player = 4; player--;) {
+        for (unsigned button = player == 0? GBButtonCount:GBGameBoyButtonCount; button--;) {
+            NSNumber *other = [[NSUserDefaults standardUserDefaults] valueForKey:button_to_preference_name(button, player)];
+            if (other && [other unsignedIntValue] == key) {
+                ret++;
+            }
+        }
+    }
+    return ret;
+}
+
 - (id)tableView:(NSTableView *)tableView objectValueForTableColumn:(NSTableColumn *)tableColumn row:(NSInteger)row
 {
     if ([tableColumn.identifier isEqualToString:@"keyName"]) {
@@ -176,6 +190,12 @@
     
     NSNumber *key = [[NSUserDefaults standardUserDefaults] valueForKey:button_to_preference_name(row, self.playerListButton.selectedTag)];
     if (key) {
+        if ([self usesForKey:[key unsignedIntValue]] > 1) {
+            return [[NSAttributedString alloc] initWithString:[NSString displayStringForKeyCode: [key unsignedIntegerValue]]
+                                                   attributes:@{NSForegroundColorAttributeName: [NSColor colorWithRed:0.9375 green:0.25 blue:0.25 alpha:1.0],
+                                                                NSFontAttributeName: [NSFont boldSystemFontOfSize:[NSFont systemFontSize]]
+                                                   }];
+        }
         return [NSString displayStringForKeyCode: [key unsignedIntegerValue]];
     }
 
diff --git a/Cocoa/Joypad~dark.png b/Cocoa/Joypad~dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..8a7687b5fffcef9c4fec0f4b00ee026ec6ee3b11
GIT binary patch
literal 6244
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
NGB>d%7H!#k=wJIrFU0@=

literal 0
HcmV?d00001

diff --git a/Cocoa/Joypad~dark@2x.png b/Cocoa/Joypad~dark@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..ce2a07cc1a35f58e36814aa88adaecc41ba256b5
GIT binary patch
literal 7175
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
Ohk>4nZiTi>)PDil;Mytx

literal 0
HcmV?d00001

diff --git a/Cocoa/NSImageNamedDarkSupport.m b/Cocoa/NSImageNamedDarkSupport.m
new file mode 100644
index 00000000..821ba3b9
--- /dev/null
+++ b/Cocoa/NSImageNamedDarkSupport.m
@@ -0,0 +1,42 @@
+#import <AppKit/AppKit.h>
+#import <objc/runtime.h>
+
+@interface NSImageRep(PrivateAPI)
+@property(setter=_setAppearanceName:) NSString *_appearanceName;
+@end
+
+static NSImage * (*imageNamed)(Class self, SEL _cmd, NSString *name);
+
+@implementation NSImage(DarkHooks)
+
++ (NSImage *)imageNamedWithDark:(NSImageName)name
+{
+    NSImage *light = imageNamed(self, _cmd, name);
+    if (@available(macOS 10.14, *)) {
+        NSImage *dark = imageNamed(self, _cmd, [name stringByAppendingString:@"~dark"]);
+        if (!dark) {
+            return light;
+        }
+        NSImage *ret = [[NSImage alloc] initWithSize:light.size];
+        for (NSImageRep *rep in light.representations) {
+            [rep _setAppearanceName:NSAppearanceNameAqua];
+            [ret addRepresentation:rep];
+        }
+        for (NSImageRep *rep in dark.representations) {
+            [rep _setAppearanceName:NSAppearanceNameDarkAqua];
+            [ret addRepresentation:rep];
+        }
+        return ret;
+    }
+    return light;
+}
+
++(void)load
+{
+    if (@available(macOS 10.14, *)) {
+        imageNamed = (void *)[self methodForSelector:@selector(imageNamed:)];
+        method_setImplementation(class_getClassMethod(self, @selector(imageNamed:)),
+                                 [self methodForSelector:@selector(imageNamedWithDark:)]);
+    }
+}
+@end
diff --git a/Cocoa/Preferences.xib b/Cocoa/Preferences.xib
index aa4a87da..99c65435 100644
--- a/Cocoa/Preferences.xib
+++ b/Cocoa/Preferences.xib
@@ -492,7 +492,7 @@
                         <rect key="frame" x="1" y="1" width="238" height="209"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <tableView focusRingType="none" appearanceType="vibrantLight" verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" columnReordering="NO" columnResizing="NO" multipleSelection="NO" emptySelection="NO" autosaveColumns="NO" typeSelect="NO" id="UDd-IJ-fxX">
+                            <tableView focusRingType="none" verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" columnReordering="NO" columnResizing="NO" multipleSelection="NO" emptySelection="NO" autosaveColumns="NO" typeSelect="NO" id="UDd-IJ-fxX">
                                 <rect key="frame" x="0.0" y="0.0" width="238" height="209"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <size key="intercellSpacing" width="3" height="2"/>
@@ -507,8 +507,8 @@
                                         </tableHeaderCell>
                                         <textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" title="Text Cell" id="mqT-jD-eXS">
                                             <font key="font" metaFont="system"/>
-                                            <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
-                                            <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                            <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                                            <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                         </textFieldCell>
                                         <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                     </tableColumn>
@@ -520,8 +520,8 @@
                                         </tableHeaderCell>
                                         <textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" identifier="keyValue" title="Text Cell" id="tn8-0i-1q1">
                                             <font key="font" metaFont="system"/>
-                                            <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
-                                            <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                            <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                                            <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                         </textFieldCell>
                                         <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                     </tableColumn>
diff --git a/Cocoa/Speaker~dark.png b/Cocoa/Speaker~dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..f3f820a39c06980894e3dad21c3e86844140f7b9
GIT binary patch
literal 4562
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
K_{HvP*8U62yWYY8

literal 0
HcmV?d00001

diff --git a/Cocoa/Speaker~dark@2x.png b/Cocoa/Speaker~dark@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..bdc3eb7040486287b186efec714544c7c7d6d308
GIT binary patch
literal 5992
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

literal 0
HcmV?d00001

diff --git a/HexFiend/HFFunctions.h b/HexFiend/HFFunctions.h
index 3d3586d0..aaab1076 100644
--- a/HexFiend/HFFunctions.h
+++ b/HexFiend/HFFunctions.h
@@ -4,7 +4,7 @@
 #import <libkern/OSAtomic.h>
 
 #define HFDEFAULT_FONT (@"Monaco")
-#define HFDEFAULT_FONTSIZE ((CGFloat)10.)
+#define HFDEFAULT_FONTSIZE ((CGFloat)11.)
 
 #define HFZeroRange (HFRange){0, 0}
 
diff --git a/HexFiend/HFLineCountingRepresenter.m b/HexFiend/HFLineCountingRepresenter.m
index d6b0560e..4a81fc83 100644
--- a/HexFiend/HFLineCountingRepresenter.m
+++ b/HexFiend/HFLineCountingRepresenter.m
@@ -57,8 +57,8 @@ static CGFloat maximumDigitAdvanceForFont(NSFont *font) {
         interiorShadowEdge = NSMaxXEdge;
         
         _borderedEdges = (1 << NSMaxXEdge);
-        _borderColor = [[NSColor darkGrayColor] retain];
-        _backgroundColor = [[NSColor colorWithCalibratedWhite:(CGFloat).87 alpha:1] retain];
+        _borderColor = [[NSColor controlShadowColor] retain];
+        _backgroundColor = [[NSColor windowBackgroundColor] retain];
     }
     return self;
 }
@@ -82,9 +82,9 @@ static CGFloat maximumDigitAdvanceForFont(NSFont *font) {
     lineNumberFormat = (HFLineNumberFormat)[coder decodeInt64ForKey:@"HFLineNumberFormat"];
     
     _borderedEdges = [coder decodeObjectForKey:@"HFBorderedEdges"] ? (NSInteger)[coder decodeInt64ForKey:@"HFBorderedEdges"] : 0;
-    _borderColor = [[coder decodeObjectForKey:@"HFBorderColor"] ?: [NSColor darkGrayColor] retain];
-    _backgroundColor = [[coder decodeObjectForKey:@"HFBackgroundColor"] ?: [NSColor colorWithCalibratedWhite:(CGFloat).87 alpha:1] retain];
-    
+    _borderColor = [[NSColor controlShadowColor] retain];
+    _backgroundColor = [[NSColor windowBackgroundColor] retain];
+
     return self;
 }
 
diff --git a/HexFiend/HFLineCountingView.m b/HexFiend/HFLineCountingView.m
index d111bcd8..080599b0 100644
--- a/HexFiend/HFLineCountingView.m
+++ b/HexFiend/HFLineCountingView.m
@@ -119,20 +119,6 @@
     [super viewWillMoveToWindow:newWindow];
 }
 
-- (void)drawGradientWithClip:(NSRect)clip {
-    [_representer.backgroundColor set];
-    NSRectFill(clip);
-    
-    NSInteger shadowEdge = _representer.interiorShadowEdge;
-    
-    if (shadowEdge >= 0) {
-        const CGFloat shadowWidth = 6;
-        NSWindow *window = self.window;
-        BOOL drawActive = (window == nil || [window isKeyWindow] || [window isMainWindow]);
-        HFDrawShadow([[NSGraphicsContext currentContext] graphicsPort], self.bounds, shadowWidth, shadowEdge, drawActive, clip);
-    }
-}
-
 - (void)drawDividerWithClip:(NSRect)clipRect {
     USE(clipRect);
     
@@ -267,7 +253,7 @@ static inline int common_prefix_length(const char *a, const char *b) {
             NSUInteger glyphCount;
             [textStorage replaceCharactersInRange:replacementRange withString:replacementCharacters];
             if (previousTextStorageCharacterCount == 0) {
-                NSDictionary *atts = [[NSDictionary alloc] initWithObjectsAndKeys:_font, NSFontAttributeName, [NSColor colorWithCalibratedWhite:(CGFloat).1 alpha:(CGFloat).8], NSForegroundColorAttributeName, nil];
+                NSDictionary *atts = [[NSDictionary alloc] initWithObjectsAndKeys:_font, NSFontAttributeName, [NSColor controlTextColor], NSForegroundColorAttributeName, nil];
                 [textStorage setAttributes:atts range:NSMakeRange(0, newStringLength)];
                 [atts release];
             }
@@ -305,7 +291,7 @@ static inline int common_prefix_length(const char *a, const char *b) {
         [mutableStyle setAlignment:NSRightTextAlignment];
         NSParagraphStyle *paragraphStyle = [mutableStyle copy];
         [mutableStyle release];
-        textAttributes = [[NSDictionary alloc] initWithObjectsAndKeys:_font, NSFontAttributeName, [NSColor colorWithCalibratedWhite:(CGFloat).1 alpha:(CGFloat).8], NSForegroundColorAttributeName, paragraphStyle, NSParagraphStyleAttributeName, nil];
+        textAttributes = [[NSDictionary alloc] initWithObjectsAndKeys:_font, NSFontAttributeName, [NSColor controlTextColor], NSForegroundColorAttributeName, paragraphStyle, NSParagraphStyleAttributeName, nil];
         [paragraphStyle release];
     }
     
@@ -456,12 +442,12 @@ static inline int common_prefix_length(const char *a, const char *b) {
         }
     }
     
-    if (! textAttributes) {
+    if (!textAttributes) {
         NSMutableParagraphStyle *mutableStyle = [[NSParagraphStyle defaultParagraphStyle] mutableCopy];
         [mutableStyle setAlignment:NSRightTextAlignment];
         NSParagraphStyle *paragraphStyle = [mutableStyle copy];
         [mutableStyle release];
-        textAttributes = [[NSDictionary alloc] initWithObjectsAndKeys:_font, NSFontAttributeName, [NSColor colorWithCalibratedWhite:(CGFloat).1 alpha:(CGFloat).8], NSForegroundColorAttributeName, paragraphStyle, NSParagraphStyleAttributeName, nil];
+        textAttributes = [[NSDictionary alloc] initWithObjectsAndKeys:_font, NSFontAttributeName, [NSColor controlTextColor], NSForegroundColorAttributeName, paragraphStyle, NSParagraphStyleAttributeName, nil];
         [paragraphStyle release];
         [textStorage setAttributes:textAttributes range:NSMakeRange(0, [textStorage length])];
     }
@@ -489,27 +475,28 @@ static inline int common_prefix_length(const char *a, const char *b) {
     NSUInteger linesRemaining = ll2l(HFFPToUL(ceill(_lineRangeToDraw.length + _lineRangeToDraw.location) - floorl(_lineRangeToDraw.location)));
     
     CGFloat linesToVerticallyOffset = ld2f(_lineRangeToDraw.location - floorl(_lineRangeToDraw.location));
-    CGFloat verticalOffset = linesToVerticallyOffset * _lineHeight + 1;
+    CGFloat verticalOffset = linesToVerticallyOffset * _lineHeight + 1.5;
     NSRect textRect = self.bounds;
     textRect.size.width -= 5;
     textRect.origin.y -= verticalOffset;
-    textRect.size.height += verticalOffset;
-    
-    if (! textAttributes) {
-        NSMutableParagraphStyle *mutableStyle = [[NSParagraphStyle defaultParagraphStyle] mutableCopy];
-        [mutableStyle setAlignment:NSRightTextAlignment];
-        [mutableStyle setMinimumLineHeight:_lineHeight];
-        [mutableStyle setMaximumLineHeight:_lineHeight];
-        NSParagraphStyle *paragraphStyle = [mutableStyle copy];
-        [mutableStyle release];
-        textAttributes = [[NSDictionary alloc] initWithObjectsAndKeys:_font, NSFontAttributeName, [NSColor colorWithCalibratedWhite:(CGFloat).1 alpha:(CGFloat).8], NSForegroundColorAttributeName, paragraphStyle, NSParagraphStyleAttributeName, nil];
-        [paragraphStyle release];
-    }    
+    textRect.size.height += verticalOffset + _lineHeight;
     
+    NSMutableParagraphStyle *mutableStyle = [[NSParagraphStyle defaultParagraphStyle] mutableCopy];
+    [mutableStyle setAlignment:NSRightTextAlignment];
+    [mutableStyle setMinimumLineHeight:_lineHeight];
+    [mutableStyle setMaximumLineHeight:_lineHeight];
+    NSParagraphStyle *paragraphStyle = [mutableStyle copy];
+    [mutableStyle release];
+    NSColor *color = [[NSColor textColor] colorUsingColorSpace:[NSColorSpace deviceRGBColorSpace]];
+    color = [NSColor colorWithRed:color.redComponent green:color.greenComponent blue:color.blueComponent alpha:0.75];
+    NSDictionary *_textAttributes = [[NSDictionary alloc] initWithObjectsAndKeys:[NSFont fontWithName:_font.fontName size:9], NSFontAttributeName, color, NSForegroundColorAttributeName, paragraphStyle, NSParagraphStyleAttributeName, nil];
+    [paragraphStyle release];
     
+
     NSString *string = [self newLineStringForRange:HFRangeMake(lineIndex, linesRemaining)];
-    [string drawInRect:textRect withAttributes:textAttributes];
+    [string drawInRect:textRect withAttributes:_textAttributes];
     [string release];
+    [_textAttributes release];
 }
 
 - (void)drawLineNumbersWithClipSingleStringCellDrawing:(NSRect)clipRect {
@@ -533,7 +520,7 @@ static inline int common_prefix_length(const char *a, const char *b) {
         [mutableStyle setMaximumLineHeight:_lineHeight];
         NSParagraphStyle *paragraphStyle = [mutableStyle copy];
         [mutableStyle release];
-        textAttributes = [[NSDictionary alloc] initWithObjectsAndKeys:_font, NSFontAttributeName, [NSColor colorWithCalibratedWhite:(CGFloat).1 alpha:(CGFloat).8], NSForegroundColorAttributeName, paragraphStyle, NSParagraphStyleAttributeName, nil];
+        textAttributes = [[NSDictionary alloc] initWithObjectsAndKeys:_font, NSFontAttributeName, [NSColor controlTextColor], NSForegroundColorAttributeName, paragraphStyle, NSParagraphStyleAttributeName, nil];
         [paragraphStyle release];
     }
     
@@ -568,7 +555,7 @@ static inline int common_prefix_length(const char *a, const char *b) {
 #if TIME_LINE_NUMBERS
     CFAbsoluteTime startTime = CFAbsoluteTimeGetCurrent();
 #endif
-    NSInteger drawingMode = (useStringDrawingPath ? 1 : 3);
+    NSInteger drawingMode = 3; // (useStringDrawingPath ? 1 : 3);
     switch (drawingMode) {
         // Drawing can't be done right if fonts are wider than expected, but all
         // of these have rather nasty behavior in that case. I've commented what
@@ -606,7 +593,6 @@ static inline int common_prefix_length(const char *a, const char *b) {
 }
 
 - (void)drawRect:(NSRect)clipRect {
-    [self drawGradientWithClip:clipRect];
     [self drawDividerWithClip:clipRect];
     [self drawLineNumbersWithClip:clipRect];
 }
diff --git a/HexFiend/HFRepresenterTextView.m b/HexFiend/HFRepresenterTextView.m
index 95a763d4..7fcbd0c7 100644
--- a/HexFiend/HFRepresenterTextView.m
+++ b/HexFiend/HFRepresenterTextView.m
@@ -441,7 +441,7 @@ enum LineCoverage_t {
 - (void)drawCaretIfNecessaryWithClip:(NSRect)clipRect {
     NSRect caretRect = NSIntersectionRect(caretRectToDraw, clipRect);
     if (! NSIsEmptyRect(caretRect)) {
-        [[NSColor blackColor] set];
+        [[NSColor controlTextColor] set];
         NSRectFill(caretRect);
         lastDrawnCaretRect = caretRect;
     }
@@ -456,12 +456,18 @@ enum LineCoverage_t {
 
 /* This is the color when we are not in the key window */
 - (NSColor *)inactiveTextSelectionColor {
+    if (@available(macOS 10.14, *)) {
+        return [NSColor unemphasizedSelectedTextBackgroundColor];
+    }
     return [NSColor colorWithCalibratedWhite: (CGFloat)(212./255.) alpha:1];
 }
 
 /* This is the color when we are not the first responder, but we are in the key window */
 - (NSColor *)secondaryTextSelectionColor {
-    return [[self primaryTextSelectionColor] blendedColorWithFraction:.66 ofColor:[NSColor colorWithCalibratedWhite:.8f alpha:1]];
+    if (@available(macOS 10.14, *)) {
+        return [NSColor unemphasizedSelectedTextBackgroundColor];
+    }
+    return [NSColor colorWithCalibratedWhite: (CGFloat)(212./255.) alpha:1];
 }
 
 - (NSColor *)textSelectionColor {
@@ -826,7 +832,7 @@ enum LineCoverage_t {
 - (HFTextVisualStyleRun *)styleRunForByteAtIndex:(NSUInteger)byteIndex {
     HFTextVisualStyleRun *run = [[HFTextVisualStyleRun alloc] init];
     [run setRange:NSMakeRange(0, NSUIntegerMax)];
-    [run setForegroundColor:[NSColor blackColor]];
+    [run setForegroundColor:[NSColor textColor]];
     return [run autorelease];
 }
 
@@ -902,8 +908,8 @@ static size_t unionAndCleanLists(NSRect *rectList, id *valueList, size_t count)
         guideIndex++;
     }
     if (rectIndex > 0) {
-        [[NSColor colorWithCalibratedWhite:(CGFloat).8 alpha:1] set];
-        NSRectFillListUsingOperation(lineRects, rectIndex, NSCompositePlusDarker);
+        [[NSColor gridColor] set];
+        NSRectFillListUsingOperation(lineRects, rectIndex, NSCompositeSourceOver);
     }
     FREE_ARRAY(lineRects);
 }
@@ -1344,7 +1350,7 @@ static size_t unionAndCleanLists(NSRect *rectList, id *valueList, size_t count)
     [self _drawDefaultLineBackgrounds:clip withLineHeight:[self lineHeight] maxLines:ll2l(HFRoundUpToNextMultipleSaturate(byteCount, bytesPerLine) / bytesPerLine)];
     [self drawSelectionIfNecessaryWithClip:clip];
     
-    NSColor *textColor = [NSColor blackColor];
+    NSColor *textColor = [NSColor textColor];
     [textColor set];
     
     if (! antialias) {
diff --git a/HexFiend/HFStatusBarRepresenter.m b/HexFiend/HFStatusBarRepresenter.m
index 702dfea5..883677f9 100644
--- a/HexFiend/HFStatusBarRepresenter.m
+++ b/HexFiend/HFStatusBarRepresenter.m
@@ -29,7 +29,7 @@
 - (void)_sharedInitStatusBarView {
     NSMutableParagraphStyle *style = [[[NSParagraphStyle defaultParagraphStyle] mutableCopy] autorelease];
     [style setAlignment:NSCenterTextAlignment];
-    cellAttributes = [[NSDictionary alloc] initWithObjectsAndKeys:[NSColor colorWithCalibratedWhite:(CGFloat).15 alpha:1], NSForegroundColorAttributeName, [NSFont labelFontOfSize:10], NSFontAttributeName, style, NSParagraphStyleAttributeName, nil];
+    cellAttributes = [[NSDictionary alloc] initWithObjectsAndKeys:[NSColor windowFrameTextColor], NSForegroundColorAttributeName, [NSFont labelFontOfSize:[NSFont smallSystemFontSize]], NSFontAttributeName, style, NSParagraphStyleAttributeName, nil];
     cell = [[NSCell alloc] initTextCell:@""];
     [cell setAlignment:NSCenterTextAlignment];
     [cell setBackgroundStyle:NSBackgroundStyleRaised];
@@ -62,51 +62,24 @@
     [self setNeedsDisplay:YES];
 }
 
-- (void)drawDividerWithClip:(NSRect)clipRect {
-    [[NSColor lightGrayColor] set];
-    NSRect bounds = [self bounds];
-    NSRect lineRect = bounds;
-    lineRect.size.height = 1;
-    NSRectFill(NSIntersectionRect(lineRect, clipRect));
-}
-
-
-- (NSGradient *)getGradient:(BOOL)active {
-    static NSGradient *sActiveGradient;
-    static NSGradient *sInactiveGradient;
-    static dispatch_once_t onceToken;
-    dispatch_once(&onceToken, ^{
-        sActiveGradient = [[NSGradient alloc] initWithColorsAndLocations:
-                           [NSColor colorWithCalibratedWhite:.89 alpha:1.], 0.00, 
-                           [NSColor colorWithCalibratedWhite:.77 alpha:1.], 0.9,
-                           [NSColor colorWithCalibratedWhite:.82 alpha:1.], 1.0,
-                           nil];
-        
-        sInactiveGradient = [[NSGradient alloc] initWithColorsAndLocations:
-                             [NSColor colorWithCalibratedWhite:.93 alpha:1.], 0.00, 
-                             [NSColor colorWithCalibratedWhite:.87 alpha:1.], 0.9,
-                             [NSColor colorWithCalibratedWhite:.90 alpha:1.], 1.0,
-                             nil];
-    });
-    return active ? sActiveGradient : sInactiveGradient;
-}
-
-
 - (void)drawRect:(NSRect)clip {
     USE(clip);
     NSRect bounds = [self bounds];
     //    [[NSColor colorWithCalibratedWhite:(CGFloat).91 alpha:1] set];
     //    NSRectFill(clip);
     
-    NSWindow *window = [self window];
-    BOOL drawActive = (window == nil || [window isMainWindow] || [window isKeyWindow]);
-    [[self getGradient:drawActive] drawInRect:bounds angle:90.];
     
-    [self drawDividerWithClip:clip];
     NSRect cellRect = NSMakeRect(NSMinX(bounds), HFCeil(NSMidY(bounds) - cellSize.height / 2), NSWidth(bounds), cellSize.height);
     [cell drawWithFrame:cellRect inView:self];
 }
 
+- (void)setFrame:(NSRect)frame
+{
+    [super setFrame:frame];
+    [self.window setContentBorderThickness:frame.origin.y + frame.size.height forEdge:NSMinYEdge];
+}
+
+
 - (void)mouseDown:(NSEvent *)event {
     USE(event);
     HFStatusBarMode newMode = ([representer statusMode] + 1) % HFSTATUSMODECOUNT;
@@ -122,6 +95,7 @@
 - (void)viewDidMoveToWindow {
     HFRegisterViewForWindowAppearanceChanges(self, @selector(windowDidChangeKeyStatus:), !registeredForAppNotifications);
     registeredForAppNotifications = YES;
+    [self.window setContentBorderThickness:self.frame.origin.y + self.frame.size.height forEdge:NSMinYEdge];
     [super viewDidMoveToWindow];
 }
 
diff --git a/HexFiend/HFTextRepresenter.m b/HexFiend/HFTextRepresenter.m
index 276e0cb5..b8793b45 100644
--- a/HexFiend/HFTextRepresenter.m
+++ b/HexFiend/HFTextRepresenter.m
@@ -20,9 +20,13 @@
 - (instancetype)init {
     self = [super init];
     
-    NSColor *color1 = [NSColor colorWithCalibratedWhite:1.0 alpha:1.0];
-    NSColor *color2 = [NSColor colorWithCalibratedRed:.87 green:.89 blue:1. alpha:1.];
-    _rowBackgroundColors = [@[color1, color2] retain];
+    if (@available(macOS 10.14, *)) {
+        _rowBackgroundColors = [[NSColor alternatingContentBackgroundColors] retain];
+    } else {
+        NSColor *color1 = [NSColor windowBackgroundColor];
+        NSColor *color2 = [NSColor colorWithDeviceWhite:0.96 alpha:1];
+        _rowBackgroundColors = [@[color1, color2] retain];
+    }
     
     return self;
 }
@@ -237,7 +241,7 @@
     FOREACH(HFRangeWrapper *, wrapper, selectedRanges) {
         HFRange selectedRange = [wrapper HFRange];
         BOOL clippedRangeIsVisible;
-        NSRange clippedSelectedRange;
+        NSRange clippedSelectedRange = {0,};
         /* Necessary because zero length ranges do not intersect anything */
         if (selectedRange.length == 0) {
             /* Remember that {6, 0} is considered a subrange of {3, 3} */