Go to database: change the way the arrow keys are forwarded, so the list will scroll (#2343)

1 files changed, 17 insertions, 2 deletions

diff --git a/Source/SPGotoDatabaseController.m b/Source/SPGotoDatabaseController.m
index 54e4a22f..61ec8962 100644
--- a/Source/SPGotoDatabaseController.m
+++ b/Source/SPGotoDatabaseController.m
@@ -396,15 +396,30 @@ static BOOL StringQualifiesForWordSearch(NSString *s);
 		[cancelButton performClick:control];
 		return YES;
 	}
+	
+	// the keyboard event is the preferable choice as it will also scroll the window
+	// TODO: check if the other path is ever used
+	NSEvent *currentEvent = [NSApp currentEvent];
+	BOOL isKeyDownEvent = ([currentEvent type] == NSKeyDown);
 
 	// Arrow down/up will usually go to start/end of the text field. we want to change the selected table row.
 	if (commandSelector == @selector(moveDown:)) {
-		[databaseListView selectRowIndexes:[NSIndexSet indexSetWithIndex:([databaseListView selectedRow]+1)] byExtendingSelection:NO];
+		if(isKeyDownEvent) {
+			[databaseListView keyDown:currentEvent];
+		}
+		else {
+			[databaseListView selectRowIndexes:[NSIndexSet indexSetWithIndex:([databaseListView selectedRow]+1)] byExtendingSelection:NO];
+		}
 		return YES;
 	}
 
 	if (commandSelector == @selector(moveUp:)) {
-		[databaseListView selectRowIndexes:[NSIndexSet indexSetWithIndex:([databaseListView selectedRow]-1)] byExtendingSelection:NO];
+		if(isKeyDownEvent) {
+			[databaseListView keyDown:currentEvent];
+		}
+		else {
+			[databaseListView selectRowIndexes:[NSIndexSet indexSetWithIndex:([databaseListView selectedRow]-1)] byExtendingSelection:NO];
+		}
 		return YES;
 	}