From 28378ff19b00ff8034277bc59e57efb055706dc7 Mon Sep 17 00:00:00 2001 From: Alexander Ljungberg Date: Thu, 21 Oct 2010 17:11:47 -0300 Subject: [PATCH] Minor performance tweaks. --- AppKit/CPTokenField.j | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/AppKit/CPTokenField.j b/AppKit/CPTokenField.j index bfca2eb23..dfa561b70 100755 --- a/AppKit/CPTokenField.j +++ b/AppKit/CPTokenField.j @@ -823,12 +823,12 @@ var CPThemeStateAutoCompleting = @"CPThemeStateAutoCompleting", offset = CPPointMake(contentOrigin.x, contentOrigin.y), spaceBetweenTokens = CPSizeMake(2.0, 2.0); - // Hack to make sure we are handling with an array + // Hack to make sure we are handling an array if (![[self _tokens] isKindOfClass:[CPArray class]]) return; [contentView setSubviews:[]]; - for (var i = 0; i < [[self _tokens] count]; i++) + for (var i = 0, count = [[self _tokens] count]; i < count; i++) { var tokenView = [[self _tokens] objectAtIndex:i]; @@ -853,7 +853,7 @@ var CPThemeStateAutoCompleting = @"CPThemeStateAutoCompleting", offset.y += tokenViewSize.height + spaceBetweenTokens.height; } - // Shrink to fit. + // Make sure there is enough space to hold the new token. [contentView setFrame:CGRectMake(0, 0, CGRectGetWidth([_tokenScrollView bounds]), offset.y + tokenViewSize.height)]; [tokenView setFrameOrigin:offset]; @@ -892,12 +892,10 @@ var CPThemeStateAutoCompleting = @"CPThemeStateAutoCompleting", { offset.x = contentOrigin.x; offset.y += tokenHeight + spaceBetweenTokens.height; + [contentView setFrame:CGRectMake(0, 0, CGRectGetWidth([_tokenScrollView bounds]), offset.y + tokenHeight)]; } } - // Make the content view just the right size. - [contentView setFrame:CGRectMake(0, 0, CGRectGetWidth([_tokenScrollView bounds]), offset.y + tokenHeight)]; - var inputFrame = CGRectMake(offset.x, offset.y, [contentView bounds].size.width - offset.x, tokenHeight); element.style.left = inputFrame.origin.x + "px"; element.style.top = inputFrame.origin.y + "px";