From c76e903a65da96d6ca6ef7854f82baa44571acc7 Mon Sep 17 00:00:00 2001
From: Brent Simmons <brent@ranchero.com>
Date: Mon, 18 Mar 2019 22:17:13 -0700
Subject: [PATCH] Make some progress on the sidebar controls thing in
 preferences (Accounts).

---
 NetNewsWire.xcodeproj/project.pbxproj         |  6 +++++
 NetNewsWire/Base.lproj/Preferences.storyboard | 24 ++++++++++++++++++-
 .../AccountsControlsBackgroundView.swift      | 23 ++++++++++++++++++
 3 files changed, 52 insertions(+), 1 deletion(-)
 create mode 100644 NetNewsWire/Preferences/AccountsControlsBackgroundView.swift

diff --git a/NetNewsWire.xcodeproj/project.pbxproj b/NetNewsWire.xcodeproj/project.pbxproj
index c87ece915..9c3bc6742 100644
--- a/NetNewsWire.xcodeproj/project.pbxproj
+++ b/NetNewsWire.xcodeproj/project.pbxproj
@@ -195,6 +195,8 @@
 		8426119E1FCB6ED40086A189 /* HTMLMetadataDownloader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8426119D1FCB6ED40086A189 /* HTMLMetadataDownloader.swift */; };
 		842611A01FCB72600086A189 /* FeaturedImageDownloader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8426119F1FCB72600086A189 /* FeaturedImageDownloader.swift */; };
 		842611A21FCB769D0086A189 /* RSHTMLMetadata+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 842611A11FCB769D0086A189 /* RSHTMLMetadata+Extension.swift */; };
+		842AE5A72240ADED004A742C /* AccountsControlsBackgroundView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 842AE5A62240ADED004A742C /* AccountsControlsBackgroundView.swift */; };
+		842AE5A82240ADED004A742C /* AccountsControlsBackgroundView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 842AE5A62240ADED004A742C /* AccountsControlsBackgroundView.swift */; };
 		842E45CE1ED8C308000A8B52 /* AppNotifications.swift in Sources */ = {isa = PBXBuildFile; fileRef = 842E45CD1ED8C308000A8B52 /* AppNotifications.swift */; };
 		842E45DD1ED8C54B000A8B52 /* Browser.swift in Sources */ = {isa = PBXBuildFile; fileRef = 842E45DC1ED8C54B000A8B52 /* Browser.swift */; };
 		842E45E31ED8C681000A8B52 /* KeyboardDelegateProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 842E45E21ED8C681000A8B52 /* KeyboardDelegateProtocol.swift */; };
@@ -789,6 +791,7 @@
 		8426119D1FCB6ED40086A189 /* HTMLMetadataDownloader.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HTMLMetadataDownloader.swift; sourceTree = "<group>"; };
 		8426119F1FCB72600086A189 /* FeaturedImageDownloader.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FeaturedImageDownloader.swift; sourceTree = "<group>"; };
 		842611A11FCB769D0086A189 /* RSHTMLMetadata+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "RSHTMLMetadata+Extension.swift"; sourceTree = "<group>"; };
+		842AE5A62240ADED004A742C /* AccountsControlsBackgroundView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = AccountsControlsBackgroundView.swift; path = NetNewsWire/Preferences/AccountsControlsBackgroundView.swift; sourceTree = "<group>"; };
 		842E45CD1ED8C308000A8B52 /* AppNotifications.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = AppNotifications.swift; path = NetNewsWire/AppNotifications.swift; sourceTree = "<group>"; };
 		842E45DC1ED8C54B000A8B52 /* Browser.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Browser.swift; path = NetNewsWire/Browser.swift; sourceTree = "<group>"; };
 		842E45E21ED8C681000A8B52 /* KeyboardDelegateProtocol.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = KeyboardDelegateProtocol.swift; sourceTree = "<group>"; };
@@ -1129,6 +1132,7 @@
 				849A97841ED9ECCD007D329B /* PreferencesWindowController.swift */,
 				84754C89213E471B009CFDFB /* GeneralPrefencesViewController.swift */,
 				84E01AFC223F3050009D63C3 /* AccountsPreferencesViewController.swift */,
+				842AE5A62240ADED004A742C /* AccountsControlsBackgroundView.swift */,
 				84595CA121E9C880003E15A4 /* AdvancedPreferencesViewController.swift */,
 			);
 			name = Preferences;
@@ -2419,6 +2423,7 @@
 				840F7C3B21BDA4B40057E851 /* NSApplication+Scriptability.swift in Sources */,
 				840F7C3C21BDA4B40057E851 /* SidebarCell.swift in Sources */,
 				840F7C3D21BDA4B40057E851 /* SidebarTreeControllerDelegate.swift in Sources */,
+				842AE5A82240ADED004A742C /* AccountsControlsBackgroundView.swift in Sources */,
 				840F7C3E21BDA4B40057E851 /* UnreadCountView.swift in Sources */,
 				840F7C3F21BDA4B40057E851 /* FeedIconDownloader.swift in Sources */,
 				840F7C4021BDA4B40057E851 /* MarkCommandValidationStatus.swift in Sources */,
@@ -2608,6 +2613,7 @@
 				849A977B1ED9EC04007D329B /* UnreadIndicatorView.swift in Sources */,
 				84B99C9D1FAE83C600ECDEDB /* DeleteFromSidebarCommand.swift in Sources */,
 				849A97541ED9EAC0007D329B /* AddFeedWindowController.swift in Sources */,
+				842AE5A72240ADED004A742C /* AccountsControlsBackgroundView.swift in Sources */,
 				849A976D1ED9EBC8007D329B /* TimelineTableView.swift in Sources */,
 				84D52E951FE588BB00D14F5B /* DetailStatusBarView.swift in Sources */,
 				D5E4CC64202C1AC1009B4FFC /* MainWindowController+Scriptability.swift in Sources */,
diff --git a/NetNewsWire/Base.lproj/Preferences.storyboard b/NetNewsWire/Base.lproj/Preferences.storyboard
index 7bafbec43..4f4f925c7 100644
--- a/NetNewsWire/Base.lproj/Preferences.storyboard
+++ b/NetNewsWire/Base.lproj/Preferences.storyboard
@@ -320,6 +320,25 @@
                                     <font key="font" metaFont="system"/>
                                 </buttonCell>
                             </button>
+                            <customView translatesAutoresizingMaskIntoConstraints="NO" id="1gP-iQ-hAV" customClass="AccountsControlsBackgroundView" customModule="NetNewsWire" customModuleProvider="target">
+                                <rect key="frame" x="83" y="20" width="65" height="24"/>
+                                <subviews>
+                                    <box verticalHuggingPriority="750" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="EKJ-HA-PtK">
+                                        <rect key="frame" x="0.0" y="-2" width="64" height="5"/>
+                                    </box>
+                                    <box horizontalHuggingPriority="750" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="QRx-wf-Jl2">
+                                        <rect key="frame" x="62" y="1" width="5" height="23"/>
+                                    </box>
+                                </subviews>
+                                <constraints>
+                                    <constraint firstItem="EKJ-HA-PtK" firstAttribute="leading" secondItem="1gP-iQ-hAV" secondAttribute="leading" id="5wB-HU-dPm"/>
+                                    <constraint firstAttribute="bottom" secondItem="EKJ-HA-PtK" secondAttribute="bottom" id="7yJ-Rx-DYv"/>
+                                    <constraint firstAttribute="trailing" secondItem="EKJ-HA-PtK" secondAttribute="trailing" constant="1" id="E2G-q6-m8G"/>
+                                    <constraint firstAttribute="bottom" secondItem="QRx-wf-Jl2" secondAttribute="bottom" constant="1" id="goT-ym-EVA"/>
+                                    <constraint firstAttribute="trailing" secondItem="QRx-wf-Jl2" secondAttribute="trailing" id="jIW-Xk-22D"/>
+                                    <constraint firstItem="QRx-wf-Jl2" firstAttribute="top" secondItem="1gP-iQ-hAV" secondAttribute="top" id="zZo-7d-ZEG"/>
+                                </constraints>
+                            </customView>
                             <customView translatesAutoresizingMaskIntoConstraints="NO" id="Y7D-xQ-wep">
                                 <rect key="frame" x="156" y="20" width="274" height="260"/>
                             </customView>
@@ -327,10 +346,12 @@
                         <constraints>
                             <constraint firstAttribute="bottom" secondItem="QbY-Xt-QmB" secondAttribute="bottom" constant="20" symbolic="YES" id="1KO-Lu-ZGN"/>
                             <constraint firstItem="Y7D-xQ-wep" firstAttribute="leading" secondItem="PaF-du-r3c" secondAttribute="trailing" constant="8" symbolic="YES" id="6HJ-Kp-fDJ"/>
+                            <constraint firstItem="1gP-iQ-hAV" firstAttribute="height" secondItem="9qe-g9-RR3" secondAttribute="height" id="83d-nY-WgE"/>
+                            <constraint firstItem="1gP-iQ-hAV" firstAttribute="trailing" secondItem="PaF-du-r3c" secondAttribute="trailing" id="9Wz-8u-aBI"/>
                             <constraint firstAttribute="trailing" secondItem="Y7D-xQ-wep" secondAttribute="trailing" constant="20" symbolic="YES" id="BiM-sH-Dno"/>
                             <constraint firstItem="QbY-Xt-QmB" firstAttribute="top" secondItem="PaF-du-r3c" secondAttribute="bottom" constant="-1" id="CwF-cb-6WI"/>
                             <constraint firstItem="9qe-g9-RR3" firstAttribute="width" secondItem="QbY-Xt-QmB" secondAttribute="width" id="DAw-bV-gAa"/>
-                            <constraint firstItem="9qe-g9-RR3" firstAttribute="trailing" relation="lessThanOrEqual" secondItem="PaF-du-r3c" secondAttribute="trailing" id="NXV-59-TMC"/>
+                            <constraint firstItem="1gP-iQ-hAV" firstAttribute="bottom" secondItem="9qe-g9-RR3" secondAttribute="bottom" id="NxN-Hb-0Ov"/>
                             <constraint firstItem="PaF-du-r3c" firstAttribute="top" secondItem="GrE-GP-fYK" secondAttribute="top" constant="20" symbolic="YES" id="V61-Mz-6aS"/>
                             <constraint firstItem="QbY-Xt-QmB" firstAttribute="leading" secondItem="GrE-GP-fYK" secondAttribute="leading" constant="20" symbolic="YES" id="a8Q-Yv-mKh"/>
                             <constraint firstItem="Y7D-xQ-wep" firstAttribute="top" secondItem="GrE-GP-fYK" secondAttribute="top" constant="20" symbolic="YES" id="aLy-Bj-FNe"/>
@@ -339,6 +360,7 @@
                             <constraint firstItem="QbY-Xt-QmB" firstAttribute="height" secondItem="9qe-g9-RR3" secondAttribute="height" id="n5c-gE-KiS"/>
                             <constraint firstAttribute="bottom" secondItem="Y7D-xQ-wep" secondAttribute="bottom" constant="20" symbolic="YES" id="o1k-4Z-ABq"/>
                             <constraint firstItem="9qe-g9-RR3" firstAttribute="leading" secondItem="QbY-Xt-QmB" secondAttribute="trailing" constant="-1" id="ygJ-cM-1bf"/>
+                            <constraint firstItem="1gP-iQ-hAV" firstAttribute="leading" secondItem="9qe-g9-RR3" secondAttribute="trailing" id="zce-qz-sim"/>
                         </constraints>
                     </view>
                 </viewController>
diff --git a/NetNewsWire/Preferences/AccountsControlsBackgroundView.swift b/NetNewsWire/Preferences/AccountsControlsBackgroundView.swift
new file mode 100644
index 000000000..71a4ce1be
--- /dev/null
+++ b/NetNewsWire/Preferences/AccountsControlsBackgroundView.swift
@@ -0,0 +1,23 @@
+//
+//  AccountsControlsBackgroundView.swift
+//  NetNewsWire
+//
+//  Created by Brent Simmons on 3/18/19.
+//  Copyright © 2019 Ranchero Software. All rights reserved.
+//
+
+import AppKit
+import RSCore
+
+final class AccountsControlsBackgroundView: NSView {
+
+	private static let lightGrayColor = NSColor.rs_color(withHexString: "f7f7f7")!
+	private static let darkGrayColor = NSColor.rs_color(withHexString: "52565a")!
+
+	override func draw(_ dirtyRect: NSRect) {
+
+		let color = self.effectiveAppearance.isDarkMode ? AccountsControlsBackgroundView.darkGrayColor : AccountsControlsBackgroundView.lightGrayColor
+		color.set()
+		dirtyRect.fill()
+	}
+}