From 1176c5e099e660154fe27681c9f32ae37adaafa2 Mon Sep 17 00:00:00 2001
From: Oskar Groth <oskar@cindori.org>
Date: Thu, 9 Mar 2017 23:53:00 +0800
Subject: [PATCH] Custom border color, title adjustment

---
 .../UserInterfaceState.xcuserstate            | Bin 24429 -> 24549 bytes
 FlatButton/Base.lproj/MainMenu.xib            |  38 ++++++++++--------
 FlatButton/FlatButton.swift                   |  22 +++++++---
 3 files changed, 39 insertions(+), 21 deletions(-)

diff --git a/FlatButton.xcodeproj/project.xcworkspace/xcuserdata/Oskar.xcuserdatad/UserInterfaceState.xcuserstate b/FlatButton.xcodeproj/project.xcworkspace/xcuserdata/Oskar.xcuserdatad/UserInterfaceState.xcuserstate
index 6db694ba51002e2532e7ff1ae69f5daec215eeec..cef9eaf94d2c8cd4d9cdca0bbe8f4618854a4d77 100644
GIT binary patch
delta 13106
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

delta 13065
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
Bswe;e

diff --git a/FlatButton/Base.lproj/MainMenu.xib b/FlatButton/Base.lproj/MainMenu.xib
index c15b720..02b665c 100644
--- a/FlatButton/Base.lproj/MainMenu.xib
+++ b/FlatButton/Base.lproj/MainMenu.xib
@@ -730,16 +730,16 @@
                             </userDefinedRuntimeAttribute>
                         </userDefinedRuntimeAttributes>
                     </button>
-                    <button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="E4h-Kk-N40" customClass="FlatButton" customModule="FlatButton_Example" customModuleProvider="target">
-                        <rect key="frame" x="349" y="258" width="120" height="38"/>
+                    <button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="iGx-ll-GI1" customClass="FlatButton" customModule="FlatButton_Example" customModuleProvider="target">
+                        <rect key="frame" x="349" y="170" width="50" height="50"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                        <buttonCell key="cell" type="square" title="Button" bezelStyle="shadowlessSquare" imagePosition="above" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="DJi-tN-P3q">
+                        <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="NSBookmarksTemplate" imagePosition="overlaps" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="ywI-Fd-2ZO">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                             <font key="font" metaFont="system"/>
                         </buttonCell>
                         <userDefinedRuntimeAttributes>
                             <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
-                                <real key="value" value="4"/>
+                                <real key="value" value="25"/>
                             </userDefinedRuntimeAttribute>
                             <userDefinedRuntimeAttribute type="number" keyPath="borderWidth">
                                 <real key="value" value="1"/>
@@ -748,13 +748,13 @@
                                 <color key="value" white="1" alpha="0.0" colorSpace="calibratedWhite"/>
                             </userDefinedRuntimeAttribute>
                             <userDefinedRuntimeAttribute type="color" keyPath="activeButtonColor">
-                                <color key="value" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
+                                <color key="value" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                             </userDefinedRuntimeAttribute>
                             <userDefinedRuntimeAttribute type="color" keyPath="iconColor">
-                                <color key="value" red="0.2392156869" green="0.67450982329999998" blue="0.96862745289999996" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                <color key="value" red="0.42465101522842641" green="0.23259536125797645" blue="0.22464185002913825" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
                             </userDefinedRuntimeAttribute>
                             <userDefinedRuntimeAttribute type="color" keyPath="activeIconColor">
-                                <color key="value" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+                                <color key="value" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                             </userDefinedRuntimeAttribute>
                             <userDefinedRuntimeAttribute type="color" keyPath="textColor">
                                 <color key="value" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
@@ -764,17 +764,23 @@
                             </userDefinedRuntimeAttribute>
                             <userDefinedRuntimeAttribute type="boolean" keyPath="momentary" value="NO"/>
                             <userDefinedRuntimeAttribute type="number" keyPath="offAnimationDuration">
-                                <real key="value" value="1"/>
+                                <real key="value" value="0.20000000000000001"/>
                             </userDefinedRuntimeAttribute>
                             <userDefinedRuntimeAttribute type="number" keyPath="onAnimationDuration">
                                 <real key="value" value="0.10000000000000001"/>
                             </userDefinedRuntimeAttribute>
+                            <userDefinedRuntimeAttribute type="color" keyPath="borderColor">
+                                <color key="value" red="0.42465101519999998" green="0.2325953613" blue="0.22464185" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
+                            </userDefinedRuntimeAttribute>
+                            <userDefinedRuntimeAttribute type="color" keyPath="activeBorderColor">
+                                <color key="value" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+                            </userDefinedRuntimeAttribute>
                         </userDefinedRuntimeAttributes>
                     </button>
-                    <button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="iGx-ll-GI1" customClass="FlatButton" customModule="FlatButton_Example" customModuleProvider="target">
-                        <rect key="frame" x="349" y="168" width="120" height="38"/>
+                    <button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="E4h-Kk-N40" customClass="FlatButton" customModule="FlatButton_Example" customModuleProvider="target">
+                        <rect key="frame" x="106" y="260" width="120" height="38"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                        <buttonCell key="cell" type="square" title="Button" bezelStyle="shadowlessSquare" image="NSApplicationIcon" imagePosition="only" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="ywI-Fd-2ZO">
+                        <buttonCell key="cell" type="square" title="Button" bezelStyle="shadowlessSquare" imagePosition="above" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="DJi-tN-P3q">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                             <font key="font" metaFont="system"/>
                         </buttonCell>
@@ -786,10 +792,10 @@
                                 <real key="value" value="1"/>
                             </userDefinedRuntimeAttribute>
                             <userDefinedRuntimeAttribute type="color" keyPath="buttonColor">
-                                <color key="value" white="1" alpha="0.0" colorSpace="calibratedWhite"/>
+                                <color key="value" red="0.51891875267478793" green="0.86372964800924135" blue="0.96871268749999995" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
                             </userDefinedRuntimeAttribute>
                             <userDefinedRuntimeAttribute type="color" keyPath="activeButtonColor">
-                                <color key="value" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
+                                <color key="value" red="0.0" green="0.25098040700000002" blue="0.50196081400000003" alpha="1" colorSpace="calibratedRGB"/>
                             </userDefinedRuntimeAttribute>
                             <userDefinedRuntimeAttribute type="color" keyPath="iconColor">
                                 <color key="value" red="0.2392156869" green="0.67450982329999998" blue="0.96862745289999996" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -803,9 +809,9 @@
                             <userDefinedRuntimeAttribute type="color" keyPath="activeTextColor">
                                 <color key="value" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
                             </userDefinedRuntimeAttribute>
-                            <userDefinedRuntimeAttribute type="boolean" keyPath="momentary" value="NO"/>
+                            <userDefinedRuntimeAttribute type="boolean" keyPath="momentary" value="YES"/>
                             <userDefinedRuntimeAttribute type="number" keyPath="offAnimationDuration">
-                                <real key="value" value="1"/>
+                                <real key="value" value="0.20000000000000001"/>
                             </userDefinedRuntimeAttribute>
                             <userDefinedRuntimeAttribute type="number" keyPath="onAnimationDuration">
                                 <real key="value" value="0.10000000000000001"/>
@@ -819,6 +825,6 @@
     </objects>
     <resources>
         <image name="NSActionTemplate" width="14" height="14"/>
-        <image name="NSApplicationIcon" width="128" height="128"/>
+        <image name="NSBookmarksTemplate" width="17" height="18"/>
     </resources>
 </document>
diff --git a/FlatButton/FlatButton.swift b/FlatButton/FlatButton.swift
index 0b07d81..c69ff57 100644
--- a/FlatButton/FlatButton.swift
+++ b/FlatButton/FlatButton.swift
@@ -56,6 +56,16 @@ public class FlatButton: NSButton, CALayerDelegate {
             layer?.borderWidth = borderWidth
         }
     }
+    @IBInspectable public var borderColor: NSColor = NSColor.darkGray {
+        didSet {
+            animateColor(state == NSOnState)
+        }
+    }
+    @IBInspectable public var activeBorderColor: NSColor = NSColor.white {
+        didSet {
+            animateColor(state == NSOnState)
+        }
+    }
     @IBInspectable public var buttonColor: NSColor = NSColor.darkGray {
         didSet {
             animateColor(state == NSOnState)
@@ -86,6 +96,7 @@ public class FlatButton: NSButton, CALayerDelegate {
             animateColor(state == NSOnState)
         }
     }
+    
     override public var title: String {
         didSet {
             setupTitle()
@@ -146,6 +157,7 @@ public class FlatButton: NSButton, CALayerDelegate {
         let attributes = [NSFontAttributeName: font]
         let size = title.size(withAttributes: attributes)
         titleRect.origin.x = round((bounds.width - size.width)/2)
+        titleRect.origin.y = round((bounds.height - size.height)/2)
         titleLayer.frame = titleRect
         titleLayer.string = title
         titleLayer.font = font
@@ -174,7 +186,7 @@ public class FlatButton: NSButton, CALayerDelegate {
     }
     
     // MARK: Animations
-
+    
     internal func removeAnimations() {
         layer?.removeAllAnimations()
         if layer?.sublayers != nil {
@@ -190,14 +202,14 @@ public class FlatButton: NSButton, CALayerDelegate {
         let bgColor = isOn ? activeButtonColor : buttonColor
         let titleColor = isOn ? activeTextColor : textColor
         let imageColor = isOn ? activeIconColor : iconColor
-        let borderColor = bgColor
+        let borderColor = isOn ? activeBorderColor : self.borderColor
         layer?.animate(color: bgColor.cgColor, keyPath: "backgroundColor", duration: duration)
         layer?.animate(color: borderColor.cgColor, keyPath: "borderColor", duration: duration)
         
         /*  I started seeing high (~5%) background CPU usage in apps using
-            FlatButton, and was able to track it down to background CATextLayer animation calls
-            happening constantly, originating from the call below. It could be a CATextLayer bug.
-            For now I'm going with setting the color instantly as it fixes this issue. */
+         FlatButton, and was able to track it down to background CATextLayer animation calls
+         happening constantly, originating from the call below. It could be a CATextLayer bug.
+         For now I'm going with setting the color instantly as it fixes this issue. */
         //titleLayer.animate(color: titleColor.cgColor, keyPath: "foregroundColor", duration: duration)
         titleLayer.foregroundColor = titleColor.cgColor