Pod

LICENSE

@@ -0,0 +1,9 @@
+The MIT License (MIT)
+
+Copyright (c) 2016 Oskar Groth
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

OGSwitch.podspec

@@ -0,0 +1,24 @@
+Pod::Spec.new do |s|
+
+s.name              = 'OGSwitch'
+s.version           = '1.7'
+s.summary           = 'Switch with icon'
+s.homepage          = 'https://github.com/OskarGroth/OGSwitch'
+s.license           = {
+:type => 'MIT',
+:file => 'LICENSE'
+}
+s.author            = {
+'Oskar Groth' => 'oskar@cindori.org'
+}
+s.source            = {
+:git => 'https://github.com/OskarGroth/OGSwitch.git',
+:tag => s.version.to_s
+}
+s.platform     = :osx, '10.9'
+s.source_files = 'OGSwitch/OGSwitch.{swift}'
+s.requires_arc = true
+s.screenshot   = ""
+s.social_media_url = "https://twitter.com/cindoriapps"
+
+end

OGSwitch.xcodeproj/xcuserdata/oskar.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -10,12 +10,12 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "OGSwitch/OGSwitch.swift"
-            timestampString = "509792812.217359"
+            timestampString = "513346877.889494"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "69"
-            endingLineNumber = "69"
-            landmarkName = "setupIcon()"
+            startingLineNumber = "77"
+            endingLineNumber = "77"
+            landmarkName = "init(coder:)"
             landmarkType = "7">
             <Locations>
                <Location

OGSwitch/OGSwitch.swift

@@ -11,14 +11,42 @@ import QuartzCore
 
 public class OGSwitch : NSControl {
 
-    @IBInspectable public var tintColor: NSColor = NSColor(calibratedRed:0.27, green: 0.86, blue: 0.36, alpha: 1.0)
-    @IBInspectable public var knobBackgroundColor: NSColor = NSColor(calibratedWhite:1.0, alpha: 1.0)
-    @IBInspectable public var disabledBorderColor: NSColor = NSColor(calibratedWhite: 0.0, alpha: 0.2)
-    @IBInspectable public var disabledBackgroundColor: NSColor = NSColor.clear
-    @IBInspectable public var inactiveBackgroundColor: NSColor = NSColor(calibratedWhite: 0.0, alpha:0.3)
+    @IBInspectable public var tintColor: NSColor = NSColor(calibratedRed:0.27, green: 0.86, blue: 0.36, alpha: 1.0) {
+        didSet {
+            reloadLayer()
+        }
+    }
+    @IBInspectable public var knobBackgroundColor: NSColor = NSColor(calibratedWhite:1.0, alpha: 1.0) {
+        didSet {
+            reloadLayer()
+        }
+    }
+    @IBInspectable public var disabledBorderColor: NSColor = NSColor(calibratedWhite: 0.0, alpha: 0.2) {
+        didSet {
+            reloadLayer()
+        }
+    }
+    @IBInspectable public var disabledBackgroundColor: NSColor = NSColor.clear  {
+        didSet {
+            reloadLayer()
+        }
+    }
+    @IBInspectable public var inactiveBackgroundColor: NSColor = NSColor(calibratedWhite: 0.0, alpha:0.3) {
+        didSet {
+            reloadLayer()
+        }
+    }
     @IBInspectable public var animationDuration: TimeInterval = 0.4
-    @IBInspectable public var inactiveIcon: NSImage?
-    @IBInspectable public var activeIcon: NSImage?
+    @IBInspectable public var inactiveIcon: NSImage?  {
+        didSet {
+            reloadLayer()
+        }
+    }
+    @IBInspectable public var activeIcon: NSImage?  {
+        didSet {
+            reloadLayer()
+        }
+    }
     @IBInspectable public var ignoreRatio: Bool = false
     
     let kBorderLineWidth:CGFloat = 1.0
@@ -26,7 +54,7 @@ public class OGSwitch : NSControl {
     let kDecreasedGoldenRatio:CGFloat = 1.38
     let kEnabledOpacity:Float = 1.0
     let kDisabledOpacity:Float = 0.5
-    public var isOn:Bool = true
+    public var isOn:Bool = false
     public var isActive:Bool = false
     public var hasDragged:Bool  = false
     public var isDraggingTowardsOn:Bool = false
@@ -65,6 +93,13 @@ public class OGSwitch : NSControl {
         setupIcon()
     }
     
+    public func setOn(isOn: Bool, animated: Bool) {
+        if self.isOn != isOn {
+            self.isOn = isOn
+            reloadLayerAnimated(animated: animated)
+        }
+    }
+    
     internal func setupIcon() {
         guard let icon = inactiveIcon, let bounds = knobLayer?.bounds else {
             return
@@ -257,13 +292,14 @@ public class OGSwitch : NSControl {
         }
         
         if isOn != on {
-            Swift.print("Now: \(on)")
+            isOn = on
             if action != nil {
                 NSApp.sendAction(action!, to: target, from: self)
             }
+        } else {
+            isOn = on
         }
         
-        isOn = on
         
         hasDragged = false
         isDraggingTowardsOn = false

OGSwitchDemo/AppDelegate.swift

@@ -13,6 +13,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
 
     @IBOutlet weak var window: NSWindow!
 
+    @IBOutlet weak var switchButton: OGSwitch!
 
     func applicationDidFinishLaunching(_ aNotification: Notification) {
         // Insert code here to initialize your application
@@ -22,6 +23,15 @@ class AppDelegate: NSObject, NSApplicationDelegate {
         // Insert code here to tear down your application
     }
 
+    @IBAction func switchPress(_ sender: Any) {
+        print("Trim is now: \(switchButton.isOn)")
+        perform(#selector(timer), with: nil, afterDelay: 3)
+    }
+    
+    @objc func timer() {
+        print("Trim is after now: \(switchButton.isOn)")
+        switchButton.setOn(isOn: !switchButton.isOn, animated: false)
+    }
 
 }
 

OGSwitchDemo/Base.lproj/MainMenu.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" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="12118" systemVersion="16E195" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11762"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="12118"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -15,6 +15,7 @@
         <customObject id="-3" userLabel="Application" customClass="NSObject"/>
         <customObject id="Voe-Tx-rLC" customClass="AppDelegate" customModule="OGSwitchDemo" customModuleProvider="target">
             <connections>
+                <outlet property="switchButton" destination="M7z-uc-a7v" id="s1F-OI-IzO"/>
                 <outlet property="window" destination="QvC-M9-y7g" id="gIp-Ho-8D9"/>
             </connections>
         </customObject>
@@ -696,7 +697,13 @@
                             <userDefinedRuntimeAttribute type="image" keyPath="inactiveIcon" value="NSEnterFullScreenTemplate"/>
                             <userDefinedRuntimeAttribute type="image" keyPath="activeIcon" value="NSBookmarksTemplate"/>
                             <userDefinedRuntimeAttribute type="boolean" keyPath="ignoreRatio" value="YES"/>
+                            <userDefinedRuntimeAttribute type="color" keyPath="disabledBackgroundColor">
+                                <color key="value" red="1" green="0.40000000600000002" blue="0.40000000600000002" alpha="1" colorSpace="calibratedRGB"/>
+                            </userDefinedRuntimeAttribute>
                         </userDefinedRuntimeAttributes>
+                        <connections>
+                            <action selector="switchPress:" target="Voe-Tx-rLC" id="Mqi-G6-fmv"/>
+                        </connections>
                     </customView>
                 </subviews>
             </view>