Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 4b50636ab8 | |||
| 4cef47a199 | |||
| 3707a7070d |
+1
-1
@@ -1,7 +1,7 @@
|
||||
Pod::Spec.new do |s|
|
||||
|
||||
s.name = 'OGSwitch'
|
||||
s.version = '1.3'
|
||||
s.version = '1.4'
|
||||
s.summary = 'Switch with icon'
|
||||
s.homepage = 'https://github.com/OskarGroth/OGSwitch'
|
||||
s.license = {
|
||||
|
||||
@@ -26,7 +26,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
|
||||
@@ -257,13 +257,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
|
||||
|
||||
@@ -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,14 @@ 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)")
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -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>
|
||||
@@ -697,6 +698,9 @@
|
||||
<userDefinedRuntimeAttribute type="image" keyPath="activeIcon" value="NSBookmarksTemplate"/>
|
||||
<userDefinedRuntimeAttribute type="boolean" keyPath="ignoreRatio" value="YES"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
<connections>
|
||||
<action selector="switchPress:" target="Voe-Tx-rLC" id="Mqi-G6-fmv"/>
|
||||
</connections>
|
||||
</customView>
|
||||
</subviews>
|
||||
</view>
|
||||
|
||||
Reference in New Issue
Block a user