Skip to content

Fix WinBar menus in GUI, and off-by-one error when adding new menus #1126

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ychin merged 1 commit into from
Dec 7, 2020
Merged

Fix WinBar menus in GUI, and off-by-one error when adding new menus #1126

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 15 additions & 1 deletion src/MacVim/MMVimController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@

static NSString * const MMToolbarMenuName = @"ToolBar";
static NSString * const MMTouchbarMenuName = @"TouchBar";
static NSString * const MMWinBarMenuName = @"WinBar";
static NSString * const MMPopUpMenuPrefix = @"PopUp";
static NSString * const MMUserPopUpMenuPrefix = @"]";

Expand Down Expand Up @@ -1242,6 +1243,11 @@ - (void)addMenuWithDescriptor:(NSArray *)desc atIndex:(int)idx
return;
}

if ([rootName isEqual:MMWinBarMenuName]) {
// WinBar menus are completed handled within Vim windows. No need for GUI to do anything.
return;
}

// This is either a main menu item or a popup menu item.
NSString *title = [desc lastObject];
NSMenuItem *item = [[NSMenuItem alloc] init];
Expand All @@ -1261,7 +1267,10 @@ - (void)addMenuWithDescriptor:(NSArray *)desc atIndex:(int)idx
} else {
// If descriptor has no parent and its not a popup (or toolbar) menu,
// then it must belong to main menu.
if (!parent) parent = mainMenu;
if (!parent) {
parent = mainMenu;
idx += 1; // Main menu already has the application menu as the first item, so everything else must be shifted by one.
}

if ([parent numberOfItems] <= idx) {
[parent addItem:item];
Expand Down Expand Up @@ -1311,6 +1320,11 @@ - (void)addMenuItemWithDescriptor:(NSArray *)desc
#endif
return;
}
if ([rootName isEqual:MMWinBarMenuName]) {
// WinBar menus are completed handled within Vim windows. No need for GUI to do anything.
return;
}

NSMenu *parent = [self parentMenuForDescriptor:desc];
if (!parent) {
ASLogWarn(@"Menu item '%@' has no parent",
Expand Down