Skip to content

Simplify and fix SystemView slide scrolling logic #505

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

Open
wants to merge 1 commit into
base: unstable
Choose a base branch
from
Open

Simplify and fix SystemView slide scrolling logic #505

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 11 additions & 12 deletions es-app/src/views/SystemView.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,22 +144,21 @@ void SystemView::onCursorChanged(const CursorState& state)
updateHelpPrompts();

float startPos = mCamOffset;
float endPos = (float)mCursor;

float posMax = (float)mEntries.size();
float target = (float)mCursor;

// what's the shortest way to get to our target?
// it's one of these...

float endPos = target; // directly
float dist = abs(endPos - startPos);

if(abs(target + posMax - startPos) < dist)
endPos = target + posMax; // loop around the end (0 -> max)
if(abs(target - posMax - startPos) < dist)
endPos = target - posMax; // loop around the start (max - 1 -> -1)
if ((mScrollVelocity < 0) && (endPos > startPos)) {
// We are scrolling left, but the destination is to our right.
// => Loop around the start.
endPos -= posMax;
}
else if ((mScrollVelocity > 0) && (endPos < startPos)) {
// We are scrolling right, but the destination is to our left.
// => Loop around the end.
endPos += posMax;
}


// animate mSystemInfo's opacity (fade out, wait, fade back in)

cancelAnimation(1);
Expand Down