IBInspectable fixes

OGSwitch-Demo.xcodeproj/project.pbxproj

@@ -35,8 +35,6 @@
 		750F2E511E5D2D7200C20E79 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MainMenu.xib; sourceTree = "<group>"; };
 		750F2E531E5D2D7200C20E79 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		75256FE120FA5ABC00ED6782 /* OGSwitch.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = OGSwitch.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		7553A35020F5045900EEA571 /* OGSwitch.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OGSwitch.h; sourceTree = "<group>"; };
-		7553A35120F5045900EEA571 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -55,7 +53,6 @@
 			isa = PBXGroup;
 			children = (
 				750F2E4B1E5D2D7100C20E79 /* OGSwitchDemo */,
-				7553A34F20F5045900EEA571 /* OGSwitch */,
 				750F2E3A1E5D2CD000C20E79 /* Products */,
 				75256FE020FA5ABC00ED6782 /* Frameworks */,
 			);
@@ -88,15 +85,6 @@
 			name = Frameworks;
 			sourceTree = "<group>";
 		};
-		7553A34F20F5045900EEA571 /* OGSwitch */ = {
-			isa = PBXGroup;
-			children = (
-				7553A35020F5045900EEA571 /* OGSwitch.h */,
-				7553A35120F5045900EEA571 /* Info.plist */,
-			);
-			path = OGSwitch;
-			sourceTree = "<group>";
-		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */

OGSwitch.podspec

@@ -1,24 +0,0 @@
-Pod::Spec.new do |s|
-
-s.name              = 'OGSwitch'
-s.version           = '1.0'
-s.summary           = 'Switch Control for macOS'
-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   = "https://raw.githubusercontent.com/OskarGroth/OGSwitch/master/screenshot.jpg"
-s.social_media_url = "https://twitter.com/cindoriapps"
-
-end

OGSwitch/OGSwitch.xcodeproj/project.pbxproj

@@ -7,8 +7,9 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		75256FD820FA5A0E00ED6782 /* OGSwitch.h in Headers */ = {isa = PBXBuildFile; fileRef = 75256FD620FA5A0E00ED6782 /* OGSwitch.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		75256FDF20FA5A3E00ED6782 /* OGSwitch.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75256FDE20FA5A3E00ED6782 /* OGSwitch.swift */; };
+		753FF1A520FA64B500DFA33E /* OGSwitch.swift in Headers */ = {isa = PBXBuildFile; fileRef = 75256FDE20FA5A3E00ED6782 /* OGSwitch.swift */; settings = {ATTRIBUTES = (Public, ); }; };
+		753FF1A620FA64D200DFA33E /* OGSwitch.h in Headers */ = {isa = PBXBuildFile; fileRef = 75256FD620FA5A0E00ED6782 /* OGSwitch.h */; settings = {ATTRIBUTES = (Public, ); }; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -62,7 +63,8 @@
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				75256FD820FA5A0E00ED6782 /* OGSwitch.h in Headers */,
+				753FF1A620FA64D200DFA33E /* OGSwitch.h in Headers */,
+				753FF1A520FA64B500DFA33E /* OGSwitch.swift in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

OGSwitch/OGSwitch/OGSwitch.h

@@ -13,7 +13,3 @@ FOUNDATION_EXPORT double OGSwitchVersionNumber;
 
 //! Project version string for OGSwitch.
 FOUNDATION_EXPORT const unsigned char OGSwitchVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <OGSwitch/PublicHeader.h>
-
-

OGSwitch/OGSwitch/OGSwitch.swift

@@ -11,7 +11,7 @@ import QuartzCore
 
 //Can not be NSControl due to 10.9 issues: https://github.com/iluuu1994/ITSwitch/issues/21
 
-public class OGSwitch : NSView {
+@IBDesignable public class OGSwitch : NSView {
     
     @IBInspectable public var tintColor: NSColor = NSColor(calibratedRed:0.27, green: 0.86, blue: 0.36, alpha: 1.0) {
         didSet {
@@ -49,7 +49,16 @@ public class OGSwitch : NSView {
             reloadLayer()
         }
     }
-    @IBInspectable public var ignoreRatio: Bool = false
+    @IBInspectable public var ignoreRatio: Bool = false {
+        didSet {
+            reloadLayer()
+        }
+    }
+    @IBInspectable public var isEnabled: Bool = true {
+        didSet {
+            reloadLayerAnimated(animated: true)
+        }
+    }
     
     let kBorderLineWidth:CGFloat = 1.0
     let kGoldenRatio:CGFloat = 1.6180339875
@@ -69,11 +78,6 @@ public class OGSwitch : NSView {
     public var knobInsideLayer: CALayer?
     public var iconLayer = CALayer()
     public var lockInteraction: Bool = false
-    public var isEnabled: Bool = true {
-        didSet {
-            reloadLayerAnimated(animated: true)
-        }
-    }
     
     override public var acceptsFirstResponder: Bool {
         get {

OGSwitchDemo/Base.lproj/MainMenu.xib

@@ -698,6 +698,7 @@
                             <userDefinedRuntimeAttribute type="color" keyPath="disabledBackgroundColor">
                                 <color key="value" red="1" green="0.40000000600000002" blue="0.40000000600000002" alpha="1" colorSpace="calibratedRGB"/>
                             </userDefinedRuntimeAttribute>
+                            <userDefinedRuntimeAttribute type="boolean" keyPath="isEnabled" value="YES"/>
                         </userDefinedRuntimeAttributes>
                         <connections>
                             <action selector="switchPress:" target="Voe-Tx-rLC" id="Mqi-G6-fmv"/>

README.md

@@ -9,6 +9,11 @@ This is a `NSView` subclass that lets you create beautiful iOS-inspired switches
 
 ![OGSwitch for macOS](https://s3.amazonaws.com/cindori/images/ogswitch.png "OGSwitch for macOS")
 
+`OGSwitch` now also supports `IBDesignable` and renders directly in Interface Builder:
+
+![IBDesignable](https://i.imgur.com/F86YoKv.png "IBDesignable")
+
+
 ## Installation (Carthage)
 Configure your Cartfile to use `OGSwitch`: