averello/macvim-mirror
1
0
Fork 0
mirror of https://github.com/macvim-dev/macvim.git synced 2026-06-07 15:37:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #911 from eirnym/bracket-menu

Browse Source 
Hide MNU_HIDDEN_CHAR prefix from menu title if present
This commit is contained in:
Yee Cheng Chin
2019-07-06 19:11:16 -07:00
committed by GitHub
parent 0cbfb7381e 4849c201a0
commit 2760686ac9
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/MacVim/MMVimController.m
+13 -6
View File
@@ -42,6 +42,8 @@ static int MMAlertTextFieldHeight = 22;
static const NSString * const MMToolbarMenuName = @"ToolBar";
static const NSString * const MMTouchbarMenuName = @"TouchBar";
static const NSString * const MMPopUpMenuPrefix = @"PopUp";
static const NSString * const MMUserPopUpMenuPrefix = @"]";
// NOTE: By default a message sent to the backend will be dropped if it cannot
// be delivered instantly; otherwise there is a possibility that MacVim will
@@ -1056,14 +1058,18 @@ static BOOL isUnsafeMessage(int msgid);
pid, identifier, ex);
}
}
+ (bool) hasPopupPrefix: (NSString *) menuName
{
return [menuName hasPrefix:MMPopUpMenuPrefix] || [menuName hasPrefix:MMUserPopUpMenuPrefix];
}
- (NSMenuItem *)menuItemForDescriptor:(NSArray *)desc
{
if (!(desc && [desc count] > 0)) return nil;
NSString *rootName = [desc objectAtIndex:0];
NSArray *rootItems = [rootName hasPrefix:@"PopUp"] ? popupMenuItems
: [mainMenu itemArray];
bool popup = [MMVimController hasPopupPrefix:rootName];
NSArray *rootItems = popup ? popupMenuItems
: [mainMenu itemArray];
NSMenuItem *item = nil;
int i, count = [rootItems count];
@@ -1089,8 +1095,9 @@ static BOOL isUnsafeMessage(int msgid);
if (!(desc && [desc count] > 0)) return nil;
NSString *rootName = [desc objectAtIndex:0];
NSArray *rootItems = [rootName hasPrefix:@"PopUp"] ? popupMenuItems
: [mainMenu itemArray];
bool popup = [MMVimController hasPopupPrefix:rootName];
NSArray *rootItems = popup ? popupMenuItems
: [mainMenu itemArray];
NSMenu *menu = nil;
int i, count = [rootItems count];
@@ -1172,7 +1179,7 @@ static BOOL isUnsafeMessage(int msgid);
[item setSubmenu:menu];
NSMenu *parent = [self parentMenuForDescriptor:desc];
if (!parent && [rootName hasPrefix:@"PopUp"]) {
if (!parent && [MMVimController hasPopupPrefix:rootName]) {
if ([popupMenuItems count] <= idx) {
[popupMenuItems addObject:item];
} else {