From 8e2d904377a17899712b0bffe60168dbc4c9cddc Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Tue, 28 Apr 2020 09:14:15 -0300 Subject: [PATCH] rename property. --- native/Avalonia.Native/src/OSX/menu.h | 4 ++-- native/Avalonia.Native/src/OSX/menu.mm | 6 +++--- native/Avalonia.Native/src/OSX/window.mm | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/native/Avalonia.Native/src/OSX/menu.h b/native/Avalonia.Native/src/OSX/menu.h index 615f24cf85..228731cb28 100644 --- a/native/Avalonia.Native/src/OSX/menu.h +++ b/native/Avalonia.Native/src/OSX/menu.h @@ -16,8 +16,8 @@ class AvnAppMenu; @interface AvnMenu : NSMenu - (id) initWithDelegate: (NSObject*) del; -- (void) setIsReparented: (bool) value; -- (bool) isReparented; +- (void) setHasGlobalMenuItem: (bool) value; +- (bool) hasGlobalMenuItem; @end @interface AvnMenuItem : NSMenuItem diff --git a/native/Avalonia.Native/src/OSX/menu.mm b/native/Avalonia.Native/src/OSX/menu.mm index 915e11f6fa..1cd9cb0644 100644 --- a/native/Avalonia.Native/src/OSX/menu.mm +++ b/native/Avalonia.Native/src/OSX/menu.mm @@ -18,12 +18,12 @@ return self; } -- (bool)isReparented +- (bool)hasGlobalMenuItem { return _isReparented; } -- (void)setIsReparented:(bool)value +- (void)setHasGlobalMenuItem:(bool)value { _isReparented = value; } @@ -207,7 +207,7 @@ HRESULT AvnAppMenu::InsertItem(int index, IAvnMenuItem *item) { @autoreleasepool { - if([_native isReparented]) + if([_native hasGlobalMenuItem]) { index++; } diff --git a/native/Avalonia.Native/src/OSX/window.mm b/native/Avalonia.Native/src/OSX/window.mm index fcb4884b7d..109ed63e6f 100644 --- a/native/Avalonia.Native/src/OSX/window.mm +++ b/native/Avalonia.Native/src/OSX/window.mm @@ -1195,7 +1195,7 @@ NSArray* AllLoopModes = [NSArray arrayWithObjects: NSDefaultRunLoopMode, NSEvent [_menu insertItem:appMenuItem atIndex:0]; - [_menu setIsReparented:true]; + [_menu setHasGlobalMenuItem:true]; } [NSApp setMenu:_menu]; @@ -1216,7 +1216,7 @@ NSArray* AllLoopModes = [NSArray arrayWithObjects: NSDefaultRunLoopMode, NSEvent if(_menu != nullptr) { - [_menu setIsReparented:false]; + [_menu setHasGlobalMenuItem:false]; } [nativeAppMenu->GetNative() addItem:appMenuItem];