frameDidChange delegate methods don't work. Take them out for now.

Also adds context to the JSTokenFieldFrameDidChangeNotification for before/after frame sizes.
csm · Oct 11, 2011 · b330cfb · b330cfb
1 parent f63861c
commit b330cfb
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/JSTokenField/JSTokenField.h b/JSTokenField/JSTokenField.h
@@ -32,7 +32,8 @@
 @protocol JSTokenFieldDelegate;
 
 extern NSString *const JSTokenFieldFrameDidChangeNotification;
-extern NSString *const JSTokenFieldFrameKey;
+extern NSString *const JSTokenFieldNewFrameKey;
+extern NSString *const JSTokenFieldOldFrameKey;
 extern NSString *const JSDeletedTokenKey;
 
 @interface JSTokenField : UIView <UITextFieldDelegate> {
@@ -63,7 +64,4 @@ extern NSString *const JSDeletedTokenKey;
 - (void)tokenField:(JSTokenField *)tokenField didAddToken:(NSString *)title representedObject:(id)obj;
 - (void)tokenField:(JSTokenField *)tokenField didRemoveTokenAtIndex:(NSUInteger)index;
 
-@optional
-- (void)tokenFieldFrameWillChange:(JSTokenField *)tokenField;
-- (void)tokenField:(JSTokenField *)tokenField frameDidChange:(CGRect)newFrame;
 @end
diff --git a/JSTokenField/JSTokenField.m b/JSTokenField/JSTokenField.m
@@ -31,7 +31,8 @@
 #import <QuartzCore/QuartzCore.h>
 
 NSString *const JSTokenFieldFrameDidChangeNotification = @"JSTokenFieldFrameDidChangeNotification";
-NSString *const JSTokenFieldFrameKey = @"JSTokenFieldFrameKey";
+NSString *const JSTokenFieldNewFrameKey = @"JSTokenFieldNewFrameKey";
+NSString *const JSTokenFieldOldFrameKey = @"JSTokenFieldOldFrameKey";
 NSString *const JSDeletedTokenKey = @"JSDeletedTokenKey";
 
 #define HEIGHT_PADDING 3
@@ -301,9 +302,12 @@ - (void)toggle:(id)sender
 
 - (void)setFrame:(CGRect)frame
 {
+    CGRect oldFrame = self.frame;
+
 	[super setFrame:frame];
 
-	NSMutableDictionary *userInfo = [NSMutableDictionary dictionaryWithObject:[NSValue valueWithCGRect:frame] forKey:JSTokenFieldFrameKey];
+	NSMutableDictionary *userInfo = [NSMutableDictionary dictionaryWithObject:[NSValue valueWithCGRect:frame] forKey:JSTokenFieldNewFrameKey];
+    [userInfo setObject:[NSValue valueWithCGRect:oldFrame] forKey:JSTokenFieldOldFrameKey];
 	if (_deletedToken)
 	{
 		[userInfo setObject:_deletedToken forKey:JSDeletedTokenKey];