From daf6a9d30754e1b23b47cfa6d236bc59ae41679e Mon Sep 17 00:00:00 2001
From: Mitchell Livingston <livings124@mac.com>
Date: Fri, 21 Dec 2018 17:14:44 -0500
Subject: [PATCH] Proper dark mode for group rules sheet

---
 macosx/GroupsPrefsController.m |  3 +--
 macosx/en.lproj/GroupRules.xib | 14 +++++++-------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/macosx/GroupsPrefsController.m b/macosx/GroupsPrefsController.m
index d5a68bebf..f48b188ba 100644
--- a/macosx/GroupsPrefsController.m
+++ b/macosx/GroupsPrefsController.m
@@ -274,8 +274,7 @@
     if ([self.ruleEditor numberOfRows] == 0)
         [self.ruleEditor addRow: nil];
 
-    [NSApp beginSheet: self.groupRulesSheetWindow modalForWindow: [fTableView window] modalDelegate: nil didEndSelector: NULL
-        contextInfo: NULL];
+    [fTableView.window beginSheet:self.groupRulesSheetWindow completionHandler:nil];
 }
 
 - (IBAction) cancelRules: (id) sender
diff --git a/macosx/en.lproj/GroupRules.xib b/macosx/en.lproj/GroupRules.xib
index 88926d290..4d325ff91 100644
--- a/macosx/en.lproj/GroupRules.xib
+++ b/macosx/en.lproj/GroupRules.xib
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11762" systemVersion="16D32" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11762"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14460.31"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -15,11 +15,11 @@
         </customObject>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
         <customObject id="-3" userLabel="Application" customClass="NSObject"/>
-        <window title="Window" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" restorable="NO" oneShot="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" tabbingMode="disallowed" id="1" userLabel="Group Rules">
+        <window title="Window" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" restorable="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" tabbingMode="disallowed" id="1" userLabel="Group Rules">
             <windowStyleMask key="styleMask" titled="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" bottomStrut="YES"/>
             <rect key="contentRect" x="196" y="283" width="471" height="248"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="1440" height="877"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1417"/>
             <view key="contentView" id="2">
                 <rect key="frame" x="0.0" y="0.0" width="471" height="248"/>
                 <autoresizingMask key="autoresizingMask"/>
@@ -185,17 +185,17 @@ Gw
                                     </connections>
                                 </predicateEditor>
                             </subviews>
-                            <color key="backgroundColor" white="0.91000002999999996" alpha="1" colorSpace="calibratedWhite"/>
+                            <color key="backgroundColor" name="windowBackgroundColor" catalog="System" colorSpace="catalog"/>
                         </clipView>
                         <constraints>
                             <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="430" id="T2h-Cn-ygX"/>
                             <constraint firstAttribute="height" constant="167" id="v6L-SJ-HFk"/>
                         </constraints>
-                        <scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="33">
+                        <scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="YES" id="33">
                             <rect key="frame" x="-100" y="-100" width="360" height="15"/>
                             <autoresizingMask key="autoresizingMask"/>
                         </scroller>
-                        <scroller key="verticalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="NO" id="32">
+                        <scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="NO" id="32">
                             <rect key="frame" x="-100" y="-100" width="15" height="50"/>
                             <autoresizingMask key="autoresizingMask"/>
                         </scroller>