#2485: Fix display of type info popup in structure view when dark mod…

…e is in use.
sequelpro · Oct 2, 2018 · ab7f302 · ab7f302
1 parent 41633a8
commit ab7f302
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 64 deletions.
diff --git a/Source/SPTableStructure.h b/Source/SPTableStructure.h
@@ -41,62 +41,54 @@
 @class SPExtendedTableInfo;
 @class SPTableInfo;
 
-@interface SPFieldTypeHelp : NSObject {
+@interface SPFieldTypeHelp : NSObject
+{
 	NSString *typeName;
 	NSString *typeDefinition;
 	NSString *typeRange;
 	NSString *typeDescription;
 }
+
 @property(readonly) NSString *typeName;
 @property(readonly) NSString *typeDefinition;
 @property(readonly) NSString *typeRange;
 @property(readonly) NSString *typeDescription;
+
 @end
 
-@interface SPTableStructure : NSObject 
-#ifdef SP_CODA
-<NSTableViewDelegate, NSTableViewDataSource, NSComboBoxCellDataSource>
-#endif
+@interface SPTableStructure : NSObject <NSTableViewDelegate, NSTableViewDataSource, NSComboBoxCellDataSource>
 {
 	IBOutlet SPTablesList *tablesListInstance;
 	IBOutlet SPTableData *tableDataInstance;
 	IBOutlet SPDatabaseDocument *tableDocumentInstance;
-#ifndef SP_CODA /* ivars */
 	IBOutlet SPTableInfo *tableInfoInstance;
 	IBOutlet SPExtendedTableInfo *extendedTableInfoInstance;
-#endif
 	IBOutlet SPIndexesController *indexesController;
 	IBOutlet SPDatabaseData *databaseDataInstance;
 
 	IBOutlet NSPanel *structureHelpPanel;
 	IBOutlet NSTextView *structureHelpText;
-
-#ifndef SP_CODA /* ivars */
+
 	IBOutlet id keySheet;
 	IBOutlet id resetAutoIncrementSheet;
 	IBOutlet id resetAutoIncrementValue;
 	IBOutlet id resetAutoIncrementLine;
-#endif
 	IBOutlet SPTableView* tableSourceView;
 	IBOutlet id addFieldButton;
 	IBOutlet id duplicateFieldButton;
 	IBOutlet id removeFieldButton;
 	IBOutlet id reloadFieldsButton;
-#ifndef SP_CODA /* ivars */
 	IBOutlet id chooseKeyButton;
 	IBOutlet id structureGrabber;
 	IBOutlet id editTableButton;
 	IBOutlet id addIndexButton;
 	IBOutlet id removeIndexButton;
 	IBOutlet id refreshIndexesButton;
-#endif
 	IBOutlet SPTableView* indexesTableView;
-#ifndef SP_CODA /* ivars */
 	IBOutlet NSSplitView *tablesIndexesSplitView;
 	IBOutlet NSButton *indexesShowButton;
 
 	IBOutlet id viewColumnsMenu;
-#endif
 	IBOutlet NSPopUpButtonCell *encodingPopupCell;
 
 	SPMySQLConnection *mySQLConnection;
@@ -118,23 +110,6 @@
 	BOOL isEditingRow, isEditingNewRow, isSavingRow, alertSheetOpened;
 }
 
-#ifdef SP_CODA
-@property (assign) SPIndexesController* indexesController;
-@property (assign) id indexesTableView;
-@property (assign) id addFieldButton;
-@property (assign) id duplicateFieldButton;
-@property (assign) id removeFieldButton;
-@property (assign) id reloadFieldsButton;
-#endif
-
-#ifdef SP_CODA /* method decls */
-- (void)setDatabaseDocument:(SPDatabaseDocument*)doc;
-- (void)setTableListInstance:(SPTablesList*)list;
-- (void)setTableDataInstance:(SPTableData*)data;
-- (void)setDatabaseDataInstance:(SPDatabaseData*)data;
-- (void)setTableSourceView:(SPTableView*)tv;
-- (void)setEncodingPopupCell:(NSPopUpButtonCell*)cell;
-#endif
 - (void)showErrorSheetWith:(NSDictionary *)errorDictionary;
 
 // Edit methods

diff --git a/Source/SPTableStructure.m b/Source/SPTableStructure.m
@@ -160,23 +160,19 @@ - (id)init
 
 - (void)awakeFromNib
 {
-#ifndef SP_CODA /* ui manipulation */
 	// Set the structure and index view's vertical gridlines if required
 	[tableSourceView setGridStyleMask:[prefs boolForKey:SPDisplayTableViewVerticalGridlines] ? NSTableViewSolidVerticalGridLineMask : NSTableViewGridNone];
 	[indexesTableView setGridStyleMask:[prefs boolForKey:SPDisplayTableViewVerticalGridlines] ? NSTableViewSolidVerticalGridLineMask : NSTableViewGridNone];
-#endif
 
 	// Set the double-click action in blank areas of the table to create new rows
 	[tableSourceView setEmptyDoubleClickAction:@selector(addField:)];
 
-#ifndef SP_CODA /* set font from prefs */
 	BOOL useMonospacedFont = [prefs boolForKey:SPUseMonospacedFonts];
 	NSInteger monospacedFontSize = [prefs integerForKey:SPMonospacedFontSize] > 0 ? [prefs integerForKey:SPMonospacedFontSize] : [NSFont smallSystemFontSize];
 
 	// Set the strutcture and index view's font
 	[tableSourceView setFont:useMonospacedFont ? [NSFont fontWithName:SPDefaultMonospacedFontName size:monospacedFontSize] : [NSFont systemFontOfSize:[NSFont smallSystemFontSize]]];
 	[indexesTableView setFont:useMonospacedFont ? [NSFont fontWithName:SPDefaultMonospacedFontName size:monospacedFontSize] : [NSFont systemFontOfSize:[NSFont smallSystemFontSize]]];
-#endif
 
 	extraFieldSuggestions = [@[
 			@"None",
@@ -250,17 +246,12 @@ - (void)awakeFromNib
 												 name:SPDocumentTaskEndNotification
 											   object:tableDocumentInstance];
 
-#ifndef SP_CODA /* add prefs observer */
 	[prefs addObserver:indexesController forKeyPath:SPUseMonospacedFonts options:NSKeyValueObservingOptionNew context:NULL];
-#endif	
 
-#ifndef SP_CODA
 	// Init the view column submenu according to saved hidden status;
 	// menu items are identified by their tag number which represents the initial column index
 	for (NSMenuItem *item in [viewColumnsMenu itemArray]) [item setState:NSOnState]; // Set all items to NSOnState
-#endif
 
-#ifndef SP_CODA /* patch */
 	for (NSTableColumn *col in [tableSourceView tableColumns]) 
 	{
 		if ([col isHidden]) {
@@ -274,24 +265,7 @@ - (void)awakeFromNib
 				[[viewColumnsMenu itemWithTag:12] setState:NSOffState];
 		}
 	}
-#else
-/*
-	for (NSTableColumn *col in [tableSourceView tableColumns]) 
-	{
-		if ([col isHidden]) {
-			if ([[col identifier] isEqualToString:@"Key"])
-				[[viewColumnsMenu itemAtIndex:[viewColumnsMenu indexOfItemWithTag:7]] setState:NSOffState];
-			else if ([[col identifier] isEqualToString:@"encoding"])
-				[[viewColumnsMenu itemAtIndex:[viewColumnsMenu indexOfItemWithTag:10]] setState:NSOffState];
-			else if ([[col identifier] isEqualToString:@"collation"])
-				[[viewColumnsMenu itemAtIndex:[viewColumnsMenu indexOfItemWithTag:11]] setState:NSOffState];
-			else if ([[col identifier] isEqualToString:@"comment"])
-				[[viewColumnsMenu itemAtIndex:[viewColumnsMenu indexOfItemWithTag:12]] setState:NSOffState];
-		}
-	}
-*/
-#endif
-
+
 	[tableSourceView reloadData];
 }
 
@@ -2478,20 +2452,20 @@ - (void)_displayFieldTypeHelpIfPossible:(SPComboBoxCell *)cell
 
 	const SPFieldTypeHelp *help = [[self class] helpForFieldType:selected];
 
-	if(help) {
+	if (help) {
 		NSMutableAttributedString *as = [[NSMutableAttributedString alloc] init];
 
 		//title
 		{
-			NSDictionary *titleAttr = @{NSFontAttributeName: [NSFont boldSystemFontOfSize:[NSFont systemFontSize]]};
+			NSDictionary *titleAttr = @{NSFontAttributeName: [NSFont boldSystemFontOfSize:[NSFont systemFontSize]], NSForegroundColorAttributeName: [NSColor controlTextColor]};
 			NSAttributedString *title = [[NSAttributedString alloc] initWithString:[help typeDefinition] attributes:titleAttr];
 			[as appendAttributedString:[title autorelease]];
 			[[as mutableString] appendString:@"\n"];
 		}
 
 		//range
-		if([[help typeRange] length]) {
-			NSDictionary *rangeAttr = @{NSFontAttributeName: [NSFont systemFontOfSize:[NSFont smallSystemFontSize]]};
+		if ([[help typeRange] length]) {
+			NSDictionary *rangeAttr = @{NSFontAttributeName: [NSFont systemFontOfSize:[NSFont smallSystemFontSize]], NSForegroundColorAttributeName: [NSColor controlTextColor]};
 			NSAttributedString *range = [[NSAttributedString alloc] initWithString:[help typeRange] attributes:rangeAttr];
 			[as appendAttributedString:[range autorelease]];
 			[[as mutableString] appendString:@"\n"];
@@ -2501,7 +2475,7 @@ - (void)_displayFieldTypeHelpIfPossible:(SPComboBoxCell *)cell
 
 		//description
 		{
-			NSDictionary *descAttr = @{NSFontAttributeName: [NSFont systemFontOfSize:[NSFont systemFontSize]]};
+			NSDictionary *descAttr = @{NSFontAttributeName: [NSFont systemFontOfSize:[NSFont systemFontSize]], NSForegroundColorAttributeName: [NSColor controlTextColor]};
 			NSAttributedString *desc = [[NSAttributedString alloc] initWithString:[help typeDescription] attributes:descAttr];
 			[as appendAttributedString:[desc autorelease]];
 		}
@@ -2522,7 +2496,7 @@ - (void)_displayFieldTypeHelpIfPossible:(SPComboBoxCell *)cell
 		NSPoint topRightCorner = NSMakePoint(popUpFrame.origin.x, NSMaxY(popUpFrame));
 		NSRect screenRect = [NSScreen rectOfScreenAtPoint:topRightCorner];
 
-		if(NSMaxX(popUpFrame)+10+winRect.size.width > NSMaxX(screenRect)-10) {
+		if (NSMaxX(popUpFrame)+10+winRect.size.width > NSMaxX(screenRect)-10) {
 			// exceeds right border, display on the left
 			winRect.origin.x = popUpFrame.origin.x - 10 - winRect.size.width;
 		}
@@ -2533,6 +2507,7 @@ - (void)_displayFieldTypeHelpIfPossible:(SPComboBoxCell *)cell
 
 		winRect.size.height = rect.size.height + winAddonSize;
 		winRect.origin.y = NSMaxY(popUpFrame) - winRect.size.height;
+
 		[structureHelpPanel setFrame:winRect display:YES];
 
 		[structureHelpPanel orderFront:nil];