Skip to content
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

Jump to bottom

AnimatedDisplay animate - support negative stride #145

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

AnimatedDisplay animate - support negative stride #145

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
22 changes: 18 additions & 4 deletions source/drivers/AnimatedDisplay.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,10 @@ void AnimatedDisplay::updateScrollImage()
void AnimatedDisplay::updateAnimateImage()
{
//wait until we have rendered the last position to give a continuous animation.
if (scrollingImagePosition <= -scrollingImage.getWidth() + (display.getWidth() + scrollingImageStride) && scrollingImageRendered)
if ( ( scrollingImageStride <= 0
? scrollingImagePosition <= -scrollingImage.getWidth() + (display.getWidth() + scrollingImageStride)
: scrollingImagePosition >= scrollingImageStride)
&& scrollingImageRendered)
{
if (animationMode == ANIMATION_MODE_ANIMATE_IMAGE_WITH_CLEAR)
display.image.clear();
Expand All @@ -230,8 +233,16 @@ void AnimatedDisplay::updateAnimateImage()
return;
}

if(scrollingImagePosition > 0)
display.image.shiftLeft(-scrollingImageStride);
if ( scrollingImageStride <= 0)
{
if(scrollingImagePosition > 0)
display.image.shiftLeft(-scrollingImageStride);
}
else
{
if ( scrollingImagePosition + scrollingImage.getWidth() < display.getWidth())
display.image.shiftRight( scrollingImageStride);
}

display.image.paste(scrollingImage, scrollingImagePosition, 0, 0);

Expand Down Expand Up @@ -757,7 +768,10 @@ int AnimatedDisplay::animateAsync(Image image, int delay, int stride, int starti
stride = -stride;

//calculate starting position which is offset by the stride
scrollingImagePosition = (startingPosition == DISPLAY_ANIMATE_DEFAULT_POS) ? display.getWidth() + stride : startingPosition;
if ( stride <= 0)
scrollingImagePosition = (startingPosition == DISPLAY_ANIMATE_DEFAULT_POS) ? display.getWidth() + stride : startingPosition;
else
scrollingImagePosition = (startingPosition == DISPLAY_ANIMATE_DEFAULT_POS) ? stride - image.getWidth() : startingPosition - image.getWidth() + 1;
scrollingImageStride = stride;
scrollingImage = image;
scrollingImageRendered = false;
Expand Down