procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't calculate macOS menu data for GNUstep (bug#45502)

Browse source 
* src/nsmenu.m ([EmacsMenu fillWithWidgetValue:]): #ifdef out code
that has no effect on GNUstep and autorelease alloc'd objects.
This commit is contained in:
Alan Third 2020-12-29 20:29:00 +00:00
parent a88f63500e
commit 90bd3b3d69
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/nsmenu.m
View file

@ -539,6 +539,12 @@ - (void)fillWithWidgetValue: (void *)wvptr
{
widget_value *first_wv = (widget_value *)wvptr;
NSFont *menuFont = [NSFont menuFontOfSize:0];
NSDictionary *attributes = nil;
#ifdef NS_IMPL_COCOA
/* Cocoa doesn't allow multi-key chording in its menu display, so
work around it by using tabs to split the title into two
columns. */
NSDictionary *font_attribs = @{NSFontAttributeName: menuFont};
CGFloat maxNameWidth = 0;
CGFloat maxKeyWidth = 0;
@ -564,12 +570,14 @@ - (void)fillWithWidgetValue: (void *)wvptr
/* Set a right-aligned tab stop at the maximum width, so that the
key will appear immediately to the left of it. */
NSTextTab *tab =
[[NSTextTab alloc] initWithTextAlignment: NSTextAlignmentRight
location: maxWidth
options: @{}];
NSMutableParagraphStyle *pstyle = [[NSMutableParagraphStyle alloc] init];
[[[NSTextTab alloc] initWithTextAlignment: NSTextAlignmentRight
location: maxWidth
options: @{}] autorelease];
NSMutableParagraphStyle *pstyle = [[[NSMutableParagraphStyle alloc] init]
autorelease];
[pstyle setTabStops: @[tab]];
NSDictionary *attributes = @{NSParagraphStyleAttributeName: pstyle};
attributes = @{NSParagraphStyleAttributeName: pstyle};
#endif
/* clear existing contents */
[self removeAllItems];