Skip to content
Merged
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
Original file line number Diff line number Diff line change
Expand Up @@ -372,13 +372,22 @@ private extension KeyboardVisualizer {

func collapseActiveRepeatIfNeeded(_ group: KeyboardVisualizerGroupView?) {
guard self.visualizerSettings.collapseRepeatedGroups, let group else { return }
guard let previous = self.lastFinalizedGroup, previous.group !== group else { return }
guard let previous = self.lastFinalizedGroup, previous.group !== group else {
self.visualizerWindow.enforceMaxCount()
return
}

let items = self.eventCoordinator.items(for: group)
guard !items.isEmpty else { return }
guard !items.isEmpty else {
self.visualizerWindow.enforceMaxCount()
return
}

let identity = self.groupIdentity(for: items)
guard previous.identity == identity else { return }
guard previous.identity == identity else {
self.visualizerWindow.enforceMaxCount()
return
}

let nextRepeatCount = previous.repeatCount + 1
self.visualizerWindow.updateGroup(previous.group, with: items, repeatCount: nextRepeatCount)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -117,10 +117,15 @@ final class KeyboardVisualizerWindow: NSWindow {

func enforceMaxCount() {
let maxCount = self.settings.maxCount
var removedGroups = false
while self.groupViews.count > maxCount {
let view = self.groupViews.removeFirst()
view.removeFromSuperview()
self.onGroupRemoved?(view)
removedGroups = true
}
if removedGroups {
self.layoutGroups()
}
}

Expand Down
Loading