diff options
| author | rowanbeentje <rowan@beent.je> | 2012-06-05 22:17:10 +0000 |
|---|---|---|
| committer | rowanbeentje <rowan@beent.je> | 2012-06-05 22:17:10 +0000 |
| commit | e63fb15b08fa4b0f70a45f2393d0913b3641eeb2 (patch) | |
| tree | 285cfbe0a6d9e1e381f4a12e6bfa8d4ac737df73 | |
| parent | 88660884d44b9bbb743cc911a7fc1dc9c124e632 (diff) | |
| download | sequelpro-e63fb15b08fa4b0f70a45f2393d0913b3641eeb2.tar.gz sequelpro-e63fb15b08fa4b0f70a45f2393d0913b3641eeb2.tar.bz2 sequelpro-e63fb15b08fa4b0f70a45f2393d0913b3641eeb2.zip | |
- Fix flickering and incorrect connection view positioning on initial window creation
| -rw-r--r-- | Source/SPConnectionController.h | 1 | ||||
| -rw-r--r-- | Source/SPConnectionController.m | 4 | ||||
| -rw-r--r-- | Source/SPConnectionControllerInitializer.m | 5 |
3 files changed, 7 insertions, 3 deletions
diff --git a/Source/SPConnectionController.h b/Source/SPConnectionController.h index b7aeb7c8..2fcede2f 100644 --- a/Source/SPConnectionController.h +++ b/Source/SPConnectionController.h @@ -162,6 +162,7 @@ BOOL isEditing; BOOL reverseFavoritesSort; #endif + BOOL initComplete; BOOL mySQLConnectionCancelled; BOOL favoriteNameFieldWasTouched; diff --git a/Source/SPConnectionController.m b/Source/SPConnectionController.m index f1b80684..023ec2b6 100644 --- a/Source/SPConnectionController.m +++ b/Source/SPConnectionController.m @@ -418,7 +418,7 @@ static NSComparisonResult _compareFavoritesUsingKey(id favorite1, id favorite2, frameRect.size.height = targetResizeRect.size.height + additionalFormHeight; - if (animate) { + if (animate && initComplete) { [[connectionResizeContainer animator] setFrame:frameRect]; } else { @@ -517,7 +517,7 @@ static NSComparisonResult _compareFavoritesUsingKey(id favorite1, id favorite2, [self setSshPort:([fav objectForKey:SPFavoriteSSHPortKey] ? [fav objectForKey:SPFavoriteSSHPortKey] : @"")]; // Trigger an interface update - [self resizeTabViewToConnectionType:[self type] animating:YES]; + [self resizeTabViewToConnectionType:[self type] animating:(sender == self)]; // Check whether the password exists in the keychain, and if so add it; also record the // keychain details so we can pass around only those details if the password doesn't change diff --git a/Source/SPConnectionControllerInitializer.m b/Source/SPConnectionControllerInitializer.m index e123f5a8..675c8f62 100644 --- a/Source/SPConnectionControllerInitializer.m +++ b/Source/SPConnectionControllerInitializer.m @@ -66,7 +66,8 @@ static NSString *SPConnectionViewNibName = @"ConnectionView"; connectionKeychainItemAccount = nil; connectionSSHKeychainItemName = nil; connectionSSHKeychainItemAccount = nil; - + + initComplete = NO; isEditing = NO; isConnecting = NO; sshTunnel = nil; @@ -116,6 +117,8 @@ static NSString *SPConnectionViewNibName = @"ConnectionView"; // Set sort items currentSortItem = (SPFavoritesSortItem)[prefs integerForKey:SPFavoritesSortedBy]; reverseFavoritesSort = [prefs boolForKey:SPFavoritesSortedInReverse]; + + initComplete = YES; } return self; |