Skip to content

Fix Stuck Keys #32

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

Merged
aure merged 3 commits into from
Apr 8, 2025
Merged

Fix Stuck Keys #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e17ccfd
Update KeyContainer.swift
NickCulbertson Apr 7, 2025
d0e7a08
Revert "Update KeyContainer.swift"
NickCulbertson Apr 7, 2025
879f8af
Latching Toggle
NickCulbertson Apr 7, 2025
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
12 changes: 7 additions & 5 deletions Sources/Keyboard/KeyContainer.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,15 @@ public struct KeyContainer<Content: View>: View {

func rect(rect: CGRect) -> some View {
content(pitch, model.touchedPitches.contains(pitch) || model.externallyActivatedPitches.contains(pitch))
.contentShape(Rectangle()) // Added to improve tap/click reliability
.contentShape(Rectangle())
.gesture(
TapGesture().onEnded { _ in
if model.externallyActivatedPitches.contains(pitch) {
model.externallyActivatedPitches.remove(pitch)
} else {
model.externallyActivatedPitches.add(pitch)
if model.latching {
if model.externallyActivatedPitches.contains(pitch) {
model.externallyActivatedPitches.remove(pitch)
} else {
model.externallyActivatedPitches.add(pitch)
}
}
}
)
Expand Down
1 change: 1 addition & 0 deletions Sources/Keyboard/Keyboard.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ public struct Keyboard<Content>: View where Content: View {
}.onAppear {
model.noteOn = noteOn
model.noteOff = noteOff
model.latching = latching
}
}
}
Expand Down
1 change: 1 addition & 0 deletions Sources/Keyboard/KeyboardModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ public class KeyboardModel: ObservableObject {
var noteOn: (Pitch, CGPoint) -> Void = { _, _ in }
var noteOff: (Pitch) -> Void = { _ in }
var normalizedPoints = Array(repeating: CGPoint.zero, count: 128)
var latching: Bool = false

var touchLocations: [CGPoint] = [] {
didSet {
Expand Down