Skip to content

added the ability to specify the max and min opacity of the carousel #642

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
zippo227 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

added the ability to specify the max and min opacity of the carousel #642

Show file tree
Hide file tree
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
3 changes: 2 additions & 1 deletion iCarousel/iCarousel.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,8 @@ typedef NS_ENUM(NSInteger, iCarouselOption)
iCarouselOptionFadeMin,
iCarouselOptionFadeMax,
iCarouselOptionFadeRange,
iCarouselOptionFadeMinAlpha
iCarouselOptionMinOpacity,
iCarouselOptionMaxOpacity
};


Expand Down
17 changes: 14 additions & 3 deletions iCarousel/iCarousel.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -437,7 +437,8 @@ - (CGFloat)alphaForItemWithOffset:(CGFloat)offset
CGFloat fadeMin = -INFINITY;
CGFloat fadeMax = INFINITY;
CGFloat fadeRange = 1.0;
CGFloat fadeMinAlpha = 0.0;
CGFloat minOpacity = 0.0;
CGFloat maxOpacity = 1.0;
switch (_type)
{
case iCarouselTypeTimeMachine:
Expand Down Expand Up @@ -467,7 +468,8 @@ - (CGFloat)alphaForItemWithOffset:(CGFloat)offset
fadeMin = [self valueForOption:iCarouselOptionFadeMin withDefault:fadeMin];
fadeMax = [self valueForOption:iCarouselOptionFadeMax withDefault:fadeMax];
fadeRange = [self valueForOption:iCarouselOptionFadeRange withDefault:fadeRange];
fadeMinAlpha = [self valueForOption:iCarouselOptionFadeMinAlpha withDefault:fadeMinAlpha];
minOpacity = [self valueForOption:iCarouselOptionMinOpacity withDefault:minOpacity];
maxOpacity = [self valueForOption:iCarouselOptionMaxOpacity withDefault:maxOpacity];

#ifdef ICAROUSEL_MACOS

Expand All @@ -488,7 +490,16 @@ - (CGFloat)alphaForItemWithOffset:(CGFloat)offset
{
factor = fadeMin - offset;
}
return 1.0 - MIN(factor, fadeRange) / fadeRange * (1.0 - fadeMinAlpha);

if(factor == 0.0)
{
return 1.0;
}
else
{
double fadeAmount = (MIN(factor, fadeRange) / fadeRange);
return MAX( MIN(1.0 - fadeAmount, maxOpacity), minOpacity);
}
}

- (CGFloat)valueForOption:(iCarouselOption)option withDefault:(CGFloat)value
Expand Down