From f30bf32a472ec4aba6f073d7ca3991faab79b5d3 Mon Sep 17 00:00:00 2001 From: Erekle Date: Sat, 14 May 2016 17:01:06 +0400 Subject: [PATCH] minor fixis --- AsyncDisplayKit/ASVideoPlayerNode.mm | 7 +++++-- AsyncDisplayKit/Private/ASDefaultPlaybackButton.m | 6 +++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/AsyncDisplayKit/ASVideoPlayerNode.mm b/AsyncDisplayKit/ASVideoPlayerNode.mm index c974a5e18f..8a30f2b1a4 100644 --- a/AsyncDisplayKit/ASVideoPlayerNode.mm +++ b/AsyncDisplayKit/ASVideoPlayerNode.mm @@ -58,6 +58,8 @@ static void *ASVideoPlayerNodeContext = &ASVideoPlayerNodeContext; BOOL _muted; int32_t _periodicTimeObserverTimescale; NSString *_gravity; + + UIColor *_defaultControlsColor; } @end @@ -105,6 +107,7 @@ static void *ASVideoPlayerNodeContext = &ASVideoPlayerNodeContext; - (void)privateInit { + _defaultControlsColor = [UIColor whiteColor]; _cachedControls = [[NSMutableDictionary alloc] init]; _videoNode = [[ASVideoNode alloc] init]; @@ -220,7 +223,7 @@ static void *ASVideoPlayerNodeContext = &ASVideoPlayerNodeContext; if (_delegateFlags.delegatePlaybackButtonTint) { _playbackButtonNode.tintColor = [_delegate videoPlayerNodePlaybackButtonTint:self]; } else { - _playbackButtonNode.tintColor = [UIColor whiteColor]; + _playbackButtonNode.tintColor = _defaultControlsColor; } [_playbackButtonNode addTarget:self action:@selector(playbackButtonTapped:) forControlEvents:ASControlNodeEventTouchUpInside]; [_cachedControls setObject:_playbackButtonNode forKey:@(ASVideoPlayerNodeControlTypePlaybackButton)]; @@ -322,7 +325,7 @@ static void *ASVideoPlayerNodeContext = &ASVideoPlayerNodeContext; } else { options = @{ NSFontAttributeName : [UIFont systemFontOfSize:12.0], - NSForegroundColorAttributeName: [UIColor whiteColor] + NSForegroundColorAttributeName: _defaultControlsColor }; } diff --git a/AsyncDisplayKit/Private/ASDefaultPlaybackButton.m b/AsyncDisplayKit/Private/ASDefaultPlaybackButton.m index a3b006e1d5..6e9455bde5 100644 --- a/AsyncDisplayKit/Private/ASDefaultPlaybackButton.m +++ b/AsyncDisplayKit/Private/ASDefaultPlaybackButton.m @@ -38,9 +38,9 @@ - (nullable id)drawParametersForAsyncLayer:(_ASDisplayLayer *)layer { return @{ - @"buttonType" : [NSNumber numberWithInt:_buttonType], - @"color" : self.tintColor - }; + @"buttonType" : [NSNumber numberWithInt:_buttonType], + @"color" : self.tintColor + }; } + (void)drawRect:(CGRect)bounds withParameters:(id)parameters isCancelled:(asdisplaynode_iscancelled_block_t)isCancelledBlock isRasterizing:(BOOL)isRasterizing