Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 3 additions & 1 deletion Sources/TinyHand/ArmView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,9 @@ final class ArmView: NSView {
private let liftFrac: CGFloat = 0.06

let ink = Ink()
let ring = InkRing()
var held = false
var inkWidth: CGFloat { max(3, bounds.height * 0.0055) }
var inkWidth: CGFloat { max(2, max(3, bounds.height * 0.0055) * Preferences.penSize.scale) }

private var pressAmount: CGFloat = 0
private var gripX: CGFloat?
Expand Down Expand Up @@ -56,6 +57,7 @@ final class ArmView: NSView {
layer = root
wantsLayer = true
root.addSublayer(ink.layer)
root.addSublayer(ring.layer)
root.addSublayer(group)

root.addSublayer(dotLayer)
Expand Down
7 changes: 7 additions & 0 deletions Sources/TinyHand/Ink.swift
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,13 @@ final class Ink {
fade(s, after: fadeDelay, over: fadeDuration)
}

/// Fades out every finished drawing on screen that isn't already fading.
func fadeAll() {
for case let s as CAShapeLayer in layer.sublayers ?? [] where s !== stroke && s.animation(forKey: "fade") == nil {
fade(s, after: 0, over: fadeDuration)
}
}

func clear() {
stroke = nil
points = []
Expand Down
Loading