diff options
| author | sqlprodev <sqlprodev@northofthree.com> | 2013-02-14 19:25:27 +0000 |
|---|---|---|
| committer | sqlprodev <sqlprodev@northofthree.com> | 2013-02-14 19:25:27 +0000 |
| commit | 47069472a4b5dc6655338a77ec8b1eb9a5f5c3d9 (patch) | |
| tree | c135c5b21ece6bb5bd8f63d56f7e95fa9852abb4 /Source/SPTableContent.m | |
| parent | c37936d71c9c8ad9b721e33899bb118032466896 (diff) | |
| download | sequelpro-47069472a4b5dc6655338a77ec8b1eb9a5f5c3d9.tar.gz sequelpro-47069472a4b5dc6655338a77ec8b1eb9a5f5c3d9.tar.bz2 sequelpro-47069472a4b5dc6655338a77ec8b1eb9a5f5c3d9.zip | |
Changes required to merge Sequel Pro r4011 into Coda
Diffstat (limited to 'Source/SPTableContent.m')
| -rw-r--r-- | Source/SPTableContent.m | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/Source/SPTableContent.m b/Source/SPTableContent.m index 9c03618e..a587c945 100644 --- a/Source/SPTableContent.m +++ b/Source/SPTableContent.m @@ -68,7 +68,9 @@ #import <pthread.h> #import <SPMySQL/SPMySQL.h> +#ifndef SP_REFACTOR static NSString *SPTableFilterSetDefaultOperator = @"SPTableFilterSetDefaultOperator"; +#endif @interface SPTableContent () @@ -529,10 +531,11 @@ static NSString *SPTableFilterSetDefaultOperator = @"SPTableFilterSetDefaultOper NSString *nullValue = [prefs objectForKey:SPNullValue]; #ifndef SP_REFACTOR /* get font from prefs */ NSFont *tableFont = [NSUnarchiver unarchiveObjectWithData:[prefs dataForKey:SPGlobalResultTableFont]]; + [tableContentView setRowHeight:2.0f+NSSizeToCGSize([[NSString stringWithString:@"{ǞṶḹÜ∑zgyf"] sizeWithAttributes:[NSDictionary dictionaryWithObject:tableFont forKey:NSFontAttributeName]]).height]; #else NSFont *tableFont = [NSFont systemFontOfSize:[NSFont smallSystemFontSize]]; + [tableContentView setRowHeight:2.0f+NSSizeToCGSize([@"{ǞṶḹÜ∑zgyf" sizeWithAttributes:[NSDictionary dictionaryWithObject:tableFont forKey:NSFontAttributeName]]).height]; #endif - [tableContentView setRowHeight:2.0f+NSSizeToCGSize([[NSString stringWithString:@"{ǞṶḹÜ∑zgyf"] sizeWithAttributes:[NSDictionary dictionaryWithObject:tableFont forKey:NSFontAttributeName]]).height]; // Add the new columns to the table and filterTable for ( i = 0 ; i < (NSInteger)[dataColumns count] ; i++ ) { @@ -1483,7 +1486,11 @@ static NSString *SPTableFilterSetDefaultOperator = @"SPTableFilterSetDefaultOper */ - (IBAction)filterTable:(id)sender { - BOOL senderIsPaginationButton = (sender == paginationPreviousButton || sender == paginationNextButton || sender == paginationGoButton); + BOOL senderIsPaginationButton = (sender == paginationPreviousButton || sender == paginationNextButton +#ifndef SP_REFACTOR + || sender == paginationGoButton +#endif + ); // Record whether the filter is being triggered by using delete/backspace in the filter field, which // can trigger the effect of clicking the "clear filter" button in the field. |