From 2ae3bbf873e95c2b890bd7129b314d146b48996c Mon Sep 17 00:00:00 2001
From: Max <dmoagx@users.noreply.github.com>
Date: Thu, 19 Jul 2018 02:02:56 +0200
Subject: [PATCH] Adapt Connection View Button Bar for Dark Mode

---
 Interfaces/English.lproj/ConnectionView.xib | 10 ++++------
 Interfaces/English.lproj/MainWindow.xib     |  2 +-
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/Interfaces/English.lproj/ConnectionView.xib b/Interfaces/English.lproj/ConnectionView.xib
index 693e4f1d8..1bbb7c47d 100644
--- a/Interfaces/English.lproj/ConnectionView.xib
+++ b/Interfaces/English.lproj/ConnectionView.xib
@@ -76,11 +76,10 @@
                             <rect key="frame" x="0.0" y="0.0" width="200" height="513"/>
                             <autoresizingMask key="autoresizingMask" heightSizable="YES"/>
                             <subviews>
-                                <imageView id="5822">
+                                <customView id="Eax-vh-nTp" customClass="SPButtonBar">
                                     <rect key="frame" x="0.0" y="0.0" width="200" height="23"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
-                                    <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="axesIndependently" image="button_bar_spacer" id="5823"/>
-                                </imageView>
+                                </customView>
                                 <popUpButton id="5824">
                                     <rect key="frame" x="2" y="0.0" width="34" height="23"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
@@ -223,7 +222,7 @@
                                     </scroller>
                                 </scrollView>
                                 <button id="5853">
-                                    <rect key="frame" x="69" y="1" width="34" height="23"/>
+                                    <rect key="frame" x="69" y="0.0" width="34" height="23"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                     <buttonCell key="cell" type="smallSquare" bezelStyle="smallSquare" image="button_add" imagePosition="overlaps" alignment="center" alternateImage="button_add" inset="2" id="5854">
                                         <behavior key="behavior" lightByContents="YES"/>
@@ -234,7 +233,7 @@
                                     </connections>
                                 </button>
                                 <button id="5851">
-                                    <rect key="frame" x="35" y="1" width="34" height="23"/>
+                                    <rect key="frame" x="35" y="0.0" width="34" height="23"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                     <buttonCell key="cell" type="smallSquare" bezelStyle="smallSquare" image="button_add_folder" imagePosition="only" alignment="center" alternateImage="button_add_folder" inset="2" id="5852">
                                         <behavior key="behavior" lightByContents="YES"/>
@@ -2596,7 +2595,6 @@ DQ
         <image name="button_add" width="30" height="22"/>
         <image name="button_add_folder" width="30" height="22"/>
         <image name="button_bar_handle" width="15" height="23"/>
-        <image name="button_bar_spacer" width="11" height="23"/>
         <image name="key-icon" width="16" height="9"/>
         <image name="key-icon-alternate" width="16" height="9"/>
     </resources>
diff --git a/Interfaces/English.lproj/MainWindow.xib b/Interfaces/English.lproj/MainWindow.xib
index 8c7f21c28..7abd849b3 100644
--- a/Interfaces/English.lproj/MainWindow.xib
+++ b/Interfaces/English.lproj/MainWindow.xib
@@ -35,7 +35,7 @@
                         </connections>
                     </customView>
                     <tabView misplaced="YES" drawsBackground="NO" type="noTabsNoBorder" id="4">
-                        <rect key="frame" x="0.0" y="1" width="948" height="529"/>
+                        <rect key="frame" x="0.0" y="0.0" width="948" height="530"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <font key="font" metaFont="system"/>
                         <tabViewItems/>