Skip to content
Merged
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
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,12 @@ import SwiftUI
struct TriggerKeycorder: View {
@EnvironmentObject private var model: KeybindsConfigurationModel
@Environment(\.luminareAnimation) private var luminareAnimation
@Default(.sideDependentTriggerKey) private var sideDependentTriggerKey
@Environment(\.appearsActive) private var appearsActive

let keyLimit: Int = 5

@Default(.sideDependentTriggerKey) private var sideDependentTriggerKey

@Binding private var validCurrentKey: Set<CGKeyCode>
@State private var selectionKey: Set<CGKeyCode>

Expand Down Expand Up @@ -98,6 +100,11 @@ struct TriggerKeycorder: View {
finishedObservingKeys(wasForced: true)
}
}
.onChange(of: appearsActive) { _ in
if appearsActive {
finishedObservingKeys(wasForced: true)
}
}
.onChange(of: validCurrentKey) { _ in
if selectionKey != validCurrentKey {
selectionKey = validCurrentKey
Expand Down