Merge remote-tracking branch 'upstream/master' into upstream-ML-scrol…

…lbars Conflicts: lib/UIKit/TUIScrollKnob.m
mrjjwright · Oct 17, 2012 · a733539 · a733539
2 parents 310574e + 8827005
commit a733539
Show file tree

Hide file tree

Showing 9 changed files with 130 additions and 35 deletions.
diff --git a/lib/UIKit/TUIButton.m b/lib/UIKit/TUIButton.m
@@ -236,6 +236,7 @@ - (void)drawRect:(CGRect)r
 		CGContextSetAlpha(ctx, 0.5);
 	CGRect titleFrame = self.bounds;
 	titleFrame.size.width -= (_titleEdgeInsets.left + _titleEdgeInsets.right);
+	titleFrame.size.height -= (_titleEdgeInsets.top + _titleEdgeInsets.bottom);
 	self.titleLabel.frame = titleFrame;
 	[self.titleLabel drawRect:self.titleLabel.bounds];
 	CGContextRestoreGState(ctx);

diff --git a/lib/UIKit/TUICGAdditions.m b/lib/UIKit/TUICGAdditions.m
@@ -246,11 +246,12 @@ void TUIGraphicsEndImageContext(void)
 
 NSImage *TUIGraphicsDrawAsImage(CGSize size, void(^draw)(void))
 {
-	TUIGraphicsBeginImageContext(size);
+	TUIGraphicsBeginImageContextWithOptions(size, NO, 0);
 	draw();
 	NSImage *image = TUIGraphicsGetImageFromCurrentImageContext();
 	TUIGraphicsEndImageContext();
-
+
+	image.size = size;
 	return image;
 }
 

diff --git a/lib/UIKit/TUILabel.m b/lib/UIKit/TUILabel.m
@@ -40,6 +40,7 @@ - (id)initWithFrame:(CGRect)frame
 {
 	if((self = [super initWithFrame:frame])) {
 		renderer = [[TUITextRenderer alloc] init];
+		renderer.verticalAlignment = TUITextVerticalAlignmentMiddle;
 		[self setTextRenderers:[NSArray arrayWithObjects:renderer, nil]];
 
 		_lineBreakMode = TUILineBreakModeClip;

diff --git a/lib/UIKit/TUINSWindow.m b/lib/UIKit/TUINSWindow.m
@@ -67,8 +67,6 @@ - (NSInteger)futureMakeFirstResponderRequestToken
 
 - (BOOL)tui_makeFirstResponder:(NSResponder *)aResponder
 {
-	if(![aResponder acceptsFirstResponder])
-		return NO;
 	++makeFirstResponderCount; // cool if it overflows
 	if([aResponder respondsToSelector:@selector(initialFirstResponder)])
 		aResponder = ((TUIResponder *)aResponder).initialFirstResponder;

diff --git a/lib/UIKit/TUIScrollView.m b/lib/UIKit/TUIScrollView.m
@@ -1023,6 +1023,8 @@ - (void)_startThrow
 		_throw.t = t;
 
 		[self _startTimer:AnimationModeThrow];
+
+		BOOL pulling = self._pulling; // prefetch the pulling state before resetting it
 
 		if(_pull.xPulling) {
 			_pull.xPulling = NO;
@@ -1038,7 +1040,7 @@ - (void)_startThrow
 			_bounce.y = _pull.y;
 		}
 
-    if(self._pulling && _scrollViewFlags.didChangeContentInset){
+    if(pulling && _scrollViewFlags.didChangeContentInset){
       _scrollViewFlags.didChangeContentInset = 0;
       _bounce.x += _contentInset.left;
       _bounce.y += _contentInset.top;

diff --git a/lib/UIKit/TUITextEditor.m b/lib/UIKit/TUITextEditor.m
@@ -33,7 +33,7 @@ - (id)init
 		markedRange = NSMakeRange(NSNotFound, 0);
 		inputContext = [[NSTextInputContext alloc] initWithClient:self];
 		inputContext.acceptsGlyphInfo = YES;
-        
+		
 		_secure = NO;
 		self.attributedString = backingStore;
 	}
@@ -50,19 +50,19 @@ - (void)setSecure:(BOOL)secured {
 }
 
 - (NSAttributedString*)drawingAttributedString {
-    if(_secure) {
-        NSString *placeholder = @"\u2022";
-        NSUInteger backingStoreLength = backingStore.length;
-        NSMutableString *string = [NSMutableString string];
-        for(int i = 0; i < backingStoreLength; i++) {
-            [string appendString:placeholder];
-        }
-        
-        NSAttributedString *securePlaceHolder = [[NSAttributedString alloc] initWithString:string attributes:defaultAttributes];
-        return securePlaceHolder;
-    }
-    
-    return [super drawingAttributedString];
+	if(_secure) {
+		NSString *placeholder = @"\u2022";
+		NSUInteger backingStoreLength = backingStore.length;
+		NSMutableString *string = [NSMutableString string];
+		for(int i = 0; i < backingStoreLength; i++) {
+			[string appendString:placeholder];
+		}
+		
+		NSAttributedString *securePlaceHolder = [[NSAttributedString alloc] initWithString:string attributes:defaultAttributes];
+		return securePlaceHolder;
+	}
+	
+	return [super drawingAttributedString];
 }
 
 - (NSTextInputContext *)inputContext
@@ -121,18 +121,18 @@ - (void)setText:(NSString *)aString
 
 - (BOOL)respondsToSelector:(SEL)aSelector
 {
-    if(aSelector == @selector(copy:) || aSelector == @selector(cut:))
-        return !_secure;
-    return [super respondsToSelector:aSelector];
+	if(aSelector == @selector(copy:) || aSelector == @selector(cut:))
+		return !_secure;
+	return [super respondsToSelector:aSelector];
 }
 
 - (void)copy:(id)sender
 {
-    if(_secure) {
-    	return;
-    }
-    
-    [super copy:sender];
+	if(_secure) {
+		return;
+	}
+	
+	[super copy:sender];
 }
 
 - (void)cut:(id)sender
@@ -146,6 +146,7 @@ - (void)paste:(id)sender
 	if (self.editable) {
 		[self insertText:[[NSPasteboard generalPasteboard] stringForType:NSPasteboardTypeString]];
 	}
+	[self _scrollToIndex:MAX(_selectionStart, _selectionEnd)];
 }
 
 - (void)patchMenuWithStandardEditingMenuItems:(NSMenu *)menu
@@ -218,6 +219,7 @@ - (void)deleteCharactersInRange:(NSRange)range // designated delete
 	selectedRange.length = 0;
 	self.selectedRange = selectedRange;
 	[self _textDidChange];
+	[self _scrollToIndex:MAX(_selectionStart, _selectionEnd)];
 }
 
 
@@ -278,6 +280,7 @@ - (void)insertText:(id)aString replacementRange:(NSRange)replacementRange // des
 	[self unmarkText];
 	self.selectedRange = selectedRange;
 	[self _textDidChange];
+	[self _scrollToIndex:MAX(_selectionStart, _selectionEnd)];
 }
 
 /* The receiver inserts aString replacing the content specified by replacementRange.