TermiT/Flycut
1
1
Fork 0
mirror of https://github.com/TermiT/Flycut.git synced 2026-01-06 04:54:03 +08:00
Code Issues Projects Releases Packages Wiki Activity

fix:menu_search_with_remove_all_and_add

Browse source
This commit is contained in:
chzhc 2025-01-27 15:40:08 +08:00
parent 26036913a4
commit cfbde7f890
1 changed files with 16 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
AppController.m
View file

@ -1283,7 +1283,7 @@ didFailToRegisterForRemoteNotificationsWithError:(NSError *)error {
- (void)updateMenuContaining:(NSString*)search {
// Use GDC to prevent concurrent modification of the menu, since that would be messy.
dispatch_sync(menuQueue, ^{
dispatch_async(dispatch_get_main_queue(), ^{
[jcMenu setMenuChangedMessagesEnabled:NO];
NSArray *returnedDisplayStrings = [flycutOperator previousDisplayStrings:[[NSUserDefaults standardUserDefaults] integerForKey:@"displayNum"] containing:search];
@ -1297,48 +1297,23 @@ didFailToRegisterForRemoteNotificationsWithError:(NSError *)error {
int oldItems = [menuItems count]-jcMenuBaseItemsCount;
int newItems = [clipStrings count];
DLog(@"list=%@, oldItems=%d, newItems=%d", returnedDisplayStrings, oldItems, newItems);
if ( oldItems > newItems )
{
for ( int i = newItems; i < oldItems; i++ )
[jcMenu removeItemAtIndex:0];
}
else if ( newItems > oldItems )
{
for ( int i = oldItems; i < newItems; i++ )
{
NSMenuItem *item;
item = [[NSMenuItem alloc] initWithTitle:@"foo"
action:@selector(processMenuClippingSelection:)
keyEquivalent:@""];
[item setTarget:self];
[item setEnabled:YES];
[jcMenu insertItem:item atIndex:0];
// Way back in 0.2, failure to release the new item here was causing a quite atrocious memory leak.
[item release];
}
}
// Now set the correct titles for each menu item in main queue.
NSUInteger total = [clipStrings count];
dispatch_async(dispatch_get_main_queue(),
^{
for (NSUInteger i = 0; i < total; i++) {
NSString *pbMenuTitle = [clipStrings objectAtIndex:i];
NSUInteger index = total - 1 - i;
if (index < [jcMenu numberOfItems]) {
NSMenuItem *item = [jcMenu itemAtIndex:index];
[item setTitle:pbMenuTitle];
[jcMenu itemChanged:item];
} else {
DLog(@"Error: Index %lu is out of bounds",
(unsigned long)index);
}
}
});
for ( int i = 0; i < oldItems; i++ )
[jcMenu removeItemAtIndex:0];
});
for ( int i = 0; i < newItems; i++ )
{
NSMenuItem *item;
item = [[NSMenuItem alloc] initWithTitle:[clipStrings objectAtIndex:i]
action:@selector(processMenuClippingSelection:)
keyEquivalent:@""];
[item setTarget:self];
[item setEnabled:YES];
[jcMenu insertItem:item atIndex:0];
// Way back in 0.2, failure to release the new item here was causing a quite atrocious memory leak.
[item release];
}
});
}
-(IBAction)processMenuClippingSelection:(id)sender