Skip to content

Fixed issue when NSSwitch setOn method called witn false animation flag. #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixed issue when NSSwitch setOn method called witn false animation flag. #3

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 23 additions & 9 deletions NSSwitch/NSSwitch.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ public class NSSwitch: NSControl {

if animated {
animate(on: on)
} else {
nonAnimate(on: on)
}

self.on = on
Expand Down Expand Up @@ -150,19 +152,17 @@ public class NSSwitch: NSControl {
CATransaction.setAnimationDuration(thumbAnimationDuration)
CATransaction.setAnimationTimingFunction(CAMediaTimingFunction(name: mediaTimingFunction))

if on {
let x = backgroundView.bounds.size.width - thumbView.frame.size.width
let destinationOrigin = CGPoint(x: x, y: 0)
thumbView.animator().setFrameOrigin(destinationOrigin)
}
else {
let destinationOrigin = CGPoint(x: 0, y: 0)
thumbView.animator().setFrameOrigin(destinationOrigin)
}
let destinationOrigin = self.getThumbViewPosition(isOn: on)
thumbView.animator().setFrameOrigin(destinationOrigin)

CATransaction.commit()
}

private func nonAnimate(on: Bool) {
let destinationOrigin = self.getThumbViewPosition(isOn: on)
thumbView.setFrameOrigin(destinationOrigin)
}

private func updatePosition(pan: NSPanGestureRecognizer) {
let thumbWidth = thumbView.bounds.size.width
let leadingSpace = thumbView.frame.origin.x
Expand All @@ -184,4 +184,18 @@ public class NSSwitch: NSControl {
private func moveToNearestSwitchPosition() {
setOn(on: on, animated: true)
}

// MARK: - Helpers
/// get thumb view position depens on `NSSwitch` On/Off state
///
/// - Parameter on: `NSSwitch` On/Off state. `Bool` value
/// - Returns: return thumb view position. `CGPoint` value
private func getThumbViewPosition(isOn: Bool) -> CGPoint {
if isOn {
let x = backgroundView.bounds.size.width - thumbView.frame.size.width
return CGPoint(x: x, y: 0)
} else {
return CGPoint(x: 0, y: 0)
}
}
}