Fixed animation glitches.

mrjjwright · Oct 19, 2012 · 935c46e · 935c46e
1 parent 9bb5cce
commit 935c46e
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 11 deletions.
diff --git a/lib/UIKit/TUIScrollView+Private.h b/lib/UIKit/TUIScrollView+Private.h
@@ -9,10 +9,14 @@
 
 + (BOOL)requiresElasticSrolling;
 
+- (void)_updateScrollers;
+- (void)_updateScrollersAnimated:(BOOL)animated;
+
 @end
 
 @interface TUIScroller ()
 
 - (CGFloat)updatedScrollerWidth;
+- (CGFloat)updatedScrollerCornerRadius;
 
 @end
diff --git a/lib/UIKit/TUIScroller.m b/lib/UIKit/TUIScroller.m
@@ -54,6 +54,7 @@ @interface TUIScroller () {
 @property (nonatomic, assign) CGPoint mouseDown;
 @property (nonatomic, assign) CGRect knobStartFrame;
 
+@property (nonatomic, assign, getter = isTrackShown) BOOL trackShown;
 @property (nonatomic, readonly, getter = isVertical) BOOL vertical;
 
 - (void)_hideKnob;
@@ -148,6 +149,7 @@ - (void)_hideKnob {
 
 	self.hideKnobTimer = nil;
 	self.knobHidden = YES;
+	self.trackShown = NO;
 	[self _updateKnobAlphaWithSpeed:TUIScrollerStateChangeSpeed];
 }
 
@@ -156,7 +158,9 @@ - (BOOL)isVertical {
 }
 
 - (BOOL)isExpanded {
-	return (_scrollerFlags.hover || _scrollerFlags.active) && [TUIScrollView requiresExpandingScrollers];
+	if(![TUIScrollView requiresExpandingScrollers])
+		return NO;
+	else return (_scrollerFlags.hover || (_scrollerFlags.active && self.knobHidden) || self.trackShown);
 }
 
 - (BOOL)isFlashing {
@@ -167,6 +171,10 @@ - (CGFloat)updatedScrollerWidth {
 	return self.expanded ? TUIScrollerExpandedWidth : TUIScrollerDefaultWidth;
 }
 
+- (CGFloat)updatedScrollerCornerRadius {
+	return self.expanded ? TUIScrollerExpandedCornerRadius : TUIScrollerDefaultCornerRadius;
+}
+
 - (void)layoutSubviews {
 	[self _updateKnob];
 }
@@ -184,20 +192,15 @@ - (void)_updateKnob {
 		frame = CGRectIntegral(CGRectInset(frame, 4, 2));
 	}
 
-	[TUIView setAnimationsEnabled:NO block:^{
-		[self _refreshKnobTimer];
-		self.knob.frame = frame;
-	}];
-
-	[TUIView animateWithDuration:TUIScrollerStateChangeSpeed animations:^{
-		self.knob.layer.cornerRadius = self.expanded ? TUIScrollerExpandedCornerRadius : TUIScrollerDefaultCornerRadius;
-	}];
+	[self _refreshKnobTimer];
+	self.knob.frame = frame;
+	self.knob.layer.cornerRadius = self.updatedScrollerCornerRadius;
 }
 
 - (void)drawRect:(CGRect)rect {
-	if(!self.expanded || ![TUIScrollView requiresExpandingScrollers]) {
+	if(!self.expanded || ![TUIScrollView requiresExpandingScrollers])
 		return;
-	}
+	else self.trackShown = YES;
 
 	// TUIScrollViewIndicatorStyleLight draws a dark track underneath,
 	// but the other indicator styles draw a light track.
@@ -267,6 +270,7 @@ - (void)setScrollIndicatorStyle:(TUIScrollViewIndicatorStyle)style {
 - (void)mouseEntered:(NSEvent *)event {
 	_scrollerFlags.hover = 1;
 	[self _updateKnobAlphaWithSpeed:TUIScrollerRefreshSpeed];
+	[self.scrollView _updateScrollersAnimated:YES];
 
 	// Propogate mouse events.
 	[super mouseEntered:event];
@@ -275,6 +279,7 @@ - (void)mouseEntered:(NSEvent *)event {
 - (void)mouseExited:(NSEvent *)event {
 	_scrollerFlags.hover = 0;
 	[self _updateKnobAlphaWithSpeed:TUIScrollerStateChangeSpeed];
+	[self.scrollView _updateScrollersAnimated:YES];
 
 	// Propogate mouse events.
 	[super mouseExited:event];