Skip to content

🐞 Reset cycle when new cycle keybind is started #501

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
mrkai77 merged 3 commits into from
Jul 9, 2024
Merged

🐞 Reset cycle when new cycle keybind is started #501

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
859f04a
✨ Only preserve cycle index if current action is `.noAction`
mrkai77 Jul 9, 2024
e19fd28
🐞 Fix broken cycles
mrkai77 Jul 9, 2024
674d6d0
📝 Update docs
mrkai77 Jul 9, 2024
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
17 changes: 8 additions & 9 deletions Loop/Managers/LoopManager.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,9 @@ private extension LoopManager {
if newAction.direction == .cycle {
newAction = getNextCycleAction(action)

// Prevents an endless loop of cycling screens
// Prevents an endless loop of cycling screens. example: when a cycle only consists of:
// 1. next screen
// 2. previous screen
if triggeredFromScreenChange, newAction.direction.willChangeScreen {
performHapticFeedback()
return
Expand Down Expand Up @@ -395,18 +397,15 @@ private extension LoopManager {

var nextIndex = 0

if !currentCycle.contains(currentAction),
// If the current action is noAction, we can preserve the index from the last action.
// This would initially be done by reading the window's records, then would continue by finding the next index from the currentAction.
if currentAction.direction == .noAction,
!currentCycle.contains(currentAction),
let window = targetWindow,
let latestRecord = WindowRecords.getCurrentAction(for: window) {
// We "preserve" the cycle index based on the last record
nextIndex = (currentCycle.firstIndex(of: latestRecord) ?? -1) + 1

} else if currentAction.direction == .custom {
// We need to check if *all* the characteristics of the action are the same
nextIndex = (currentCycle.firstIndex(of: currentAction) ?? -1) + 1
} else {
// Only check the direction, since the rest of the info is insignificant
nextIndex = (currentCycle.firstIndex { $0.direction == currentAction.direction } ?? -1) + 1
nextIndex = (currentCycle.firstIndex(of: currentAction) ?? -1) + 1
}

if nextIndex >= currentCycle.count {
Expand Down