Revision: 12709 http://sourceforge.net/p/skim-app/code/12709 Author: hofman Date: 2022-01-12 15:34:41 +0000 (Wed, 12 Jan 2022) Log Message: ----------- Check for core graphics transition using private function
Modified Paths: -------------- trunk/SKTransitionController.h trunk/SKTransitionController.m Modified: trunk/SKTransitionController.h =================================================================== --- trunk/SKTransitionController.h 2022-01-12 15:30:28 UTC (rev 12708) +++ trunk/SKTransitionController.h 2022-01-12 15:34:41 UTC (rev 12709) @@ -63,8 +63,6 @@ + (NSString *)localizedNameForStyle:(SKTransitionStyle)style; -+ (BOOL)isCoreGraphicsTransition:(SKTransitionStyle)style; - - (void)animateForRect:(NSRect)rect from:(NSUInteger)fromIndex to:(NSUInteger)toIndex change:(NSRect (^)(void))change; @end Modified: trunk/SKTransitionController.m =================================================================== --- trunk/SKTransitionController.m 2022-01-12 15:30:28 UTC (rev 12708) +++ trunk/SKTransitionController.m 2022-01-12 15:34:41 UTC (rev 12709) @@ -218,6 +218,10 @@ } } +static inline BOOL SKIsCoreGraphicsTransition(SKTransitionStyle style) { + return hasCoreGraphicsTransitions && style > SKNoTransition && style < SKCoreImageTransition; +} + + (NSArray *)transitionNames { static NSArray *transitionNames = nil; @@ -268,7 +272,7 @@ + (NSString *)localizedNameForStyle:(SKTransitionStyle)style { if (style == SKNoTransition) { return NSLocalizedString(@"No Transition", @"Transition name"); - } else if ([self isCoreGraphicsTransition:style]) { + } else if (SKIsCoreGraphicsTransition(style)) { static NSArray *localizedCoreGraphicsNames = nil; if (localizedCoreGraphicsNames == nil) localizedCoreGraphicsNames = [[NSArray alloc] initWithObjects:@"", @@ -289,10 +293,6 @@ return @""; } -+ (BOOL)isCoreGraphicsTransition:(SKTransitionStyle)style { - return hasCoreGraphicsTransitions && style > SKNoTransition && style < SKCoreImageTransition; -} - - (void)dealloc { view = nil; SKDESTROY(transitionView); @@ -474,7 +474,7 @@ change(); - } else if ([SKTransitionController isCoreGraphicsTransition:[currentTransition transitionStyle]]) { + } else if (SKIsCoreGraphicsTransition([currentTransition transitionStyle])) { animating = YES; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. _______________________________________________ Skim-app-commit mailing list Skim-app-commit@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/skim-app-commit