Revert "Remove 'Wait before searching' option"

This reverts commit 991f037.
quicksilver · May 27, 2022 · 39c50f2 · 39c50f2
1 parent 84be3f5
commit 39c50f2
Show file tree

Hide file tree

Showing 5 changed files with 125 additions and 52 deletions.
diff --git a/Quicksilver/Code-QuickStepCore/QSPreferenceKeys.h b/Quicksilver/Code-QuickStepCore/QSPreferenceKeys.h
@@ -31,6 +31,7 @@ Following lines are no longer used in this project.
 #define kDelayQuit @"Delay Before Quitting"
 
 #define kResetDelay @"Reset Delay"
+#define kSearchDelay @"Search Delay"
 
 #define kActivationHotKey @"ActivationHotKey"
 #define kHideDockIcon @"Hide Dock Icon"
@@ -76,4 +77,4 @@ Following lines are no longer used in this project.
 #define kQSShowTaskViewerAutomatically @"QSShowTaskViewerAutomatically"
 
 // A boolean indicating whether the task viewer resizes automatically
-#define kQSResizeTaskViewerAutomatically @"QSResizeTaskViewerAutomatically"
+#define kQSResizeTaskViewerAutomatically @"QSResizeTaskViewerAutomatically"
diff --git a/Quicksilver/Code-QuickStepInterface/QSSearchObjectView.h b/Quicksilver/Code-QuickStepInterface/QSSearchObjectView.h
@@ -30,6 +30,7 @@ typedef NS_ENUM(NSUInteger, QSSearchMode) {
 	BOOL validSearch;
 
 	NSTimer *resetTimer;
+	NSTimer *searchTimer;
 	NSTimer *resultTimer;
 
 	NSTimeInterval lastTime;

diff --git a/Quicksilver/Code-QuickStepInterface/QSSearchObjectView.m b/Quicksilver/Code-QuickStepInterface/QSSearchObjectView.m
@@ -70,6 +70,7 @@ + (void)initialize {
 - (void)awakeFromNib {
 	[super awakeFromNib];
 	resetTimer = nil;
+	searchTimer = nil;
 	resultTimer = nil;
 	preferredEdge = NSMaxXEdge;
 	partialString = [[NSMutableString alloc] initWithCapacity:1];
@@ -874,6 +875,13 @@ - (void)performSearchFor:(NSString *)string from:(id)sender {
 		[resultController.searchStringField setTextColor:[NSColor redColor]];
 	}
 
+	// Extend Timers
+	if ([searchTimer isValid]) {
+		// NSLog(@"extend");
+		[searchTimer setFireDate:[NSDate dateWithTimeIntervalSinceNow:[[NSUserDefaults standardUserDefaults] floatForKey:kSearchDelay]]];
+
+	}
+
 	if ([resetTimer isValid]) {
 		CGFloat resetDelay = [[NSUserDefaults standardUserDefaults] floatForKey:kResetDelay];
 		if (resetDelay) [resetTimer setFireDate:[NSDate dateWithTimeIntervalSinceNow:resetDelay]];
@@ -890,8 +898,19 @@ - (void)resetString {
 
 - (void)partialStringChanged {
 	[self setSearchString:[partialString copy]];
-
-	[self performSearch:nil];
+
+	double searchDelay = [[NSUserDefaults standardUserDefaults] floatForKey:kSearchDelay];
+
+	// only wait for 'search delay' if we're searching all objects
+	if ([self searchMode] != SearchFilterAll) {
+		[searchTimer invalidate];
+		[self performSearch:nil];
+	} else {
+		if (![searchTimer isValid]) {
+			searchTimer = [NSTimer scheduledTimerWithTimeInterval:searchDelay target:self selector:@selector(performSearch:) userInfo:nil repeats:NO];
+		}
+		[searchTimer setFireDate:[NSDate dateWithTimeIntervalSinceNow:searchDelay]];
+	}
 
 	if (validSearch) {
 		NSColor *color = [[NSUserDefaults standardUserDefaults] colorForKey:@"QSAppearance2T"];
@@ -912,8 +931,11 @@ - (void)partialStringChanged {
 
 - (void)executeCommand:(id)sender {
 	[resultTimer invalidate];
-	[self performSearchFor:partialString from:self];
-	[self display];
+	if ([searchTimer isValid]) {
+		[searchTimer invalidate];
+		[self performSearchFor:partialString from:self];
+		[self display];
+	}
 	[resetTimer fire];
 	[[self controller] executeCommand:self];
 }
@@ -1455,6 +1477,7 @@ - (void)deleteBackward:(id)sender {
 			[self clearTextView];
 			return;
 		}
+		[searchTimer invalidate];
 		// reset the search array
 		[self setSearchArray:nil];
 		if (!partialString || partialString.length <= 1) {