From 1d01ed92d8fc9b478929fddd6ea1af67330c1fc5 Mon Sep 17 00:00:00 2001 From: Didier Korthoudt Date: Thu, 13 Jun 2019 16:30:53 +0200 Subject: [PATCH] =?UTF-8?q?Fixed:=20CPSearchField,=20when=20no=20recent=20?= =?UTF-8?q?searches=20were=20done,=20the=20menu=20wasn=E2=80=99t=20showing?= =?UTF-8?q?,=20even=20if=20search=20categories=20were=20specified=20(#2846?= =?UTF-8?q?)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AppKit/CPSearchField.j | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/AppKit/CPSearchField.j b/AppKit/CPSearchField.j index a54d8f49f..eeb852a75 100644 --- a/AppKit/CPSearchField.j +++ b/AppKit/CPSearchField.j @@ -616,9 +616,6 @@ var CPAutosavedRecentsChangedNotification = @"CPAutosavedRecentsChangedNotificat case CPSearchFieldRecentsTitleMenuItemTag: if (countOfRecents === 0) continue; - - if ([menu numberOfItems] > 0) - [self _addSeparatorToMenu:menu]; break; case CPSearchFieldRecentsMenuItemTag: @@ -641,9 +638,6 @@ var CPAutosavedRecentsChangedNotification = @"CPAutosavedRecentsChangedNotificat if (countOfRecents === 0) continue; - if ([menu numberOfItems] > 0) - [self _addSeparatorToMenu:menu]; - [item setAction:@selector(_searchFieldClearRecents:)]; [item setTarget:self]; break; @@ -651,9 +645,6 @@ var CPAutosavedRecentsChangedNotification = @"CPAutosavedRecentsChangedNotificat case CPSearchFieldNoRecentsMenuItemTag: if (countOfRecents !== 0) continue; - - if ([menu numberOfItems] > 0) - [self _addSeparatorToMenu:menu]; break; } @@ -687,7 +678,7 @@ var CPAutosavedRecentsChangedNotification = @"CPAutosavedRecentsChangedNotificat - (void)_showMenu { - if (_searchMenu === nil || [_searchMenu numberOfItems] === 0 || ![self isEnabled] || ([_recentSearches count] === 0)) + if (_searchMenu === nil || [_searchMenu numberOfItems] === 0 || ![self isEnabled]) return; var aFrame = [[self superview] convertRect:[self frame] toView:nil],