From f5020af86032daaad025ea4696c3d5463cc83f17 Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Wed, 25 Sep 2019 21:38:15 +0100 Subject: [PATCH] change window menus when windows are changed. --- native/Avalonia.Native/src/OSX/window.mm | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/native/Avalonia.Native/src/OSX/window.mm b/native/Avalonia.Native/src/OSX/window.mm index 39c9ceec13..21e190695e 100644 --- a/native/Avalonia.Native/src/OSX/window.mm +++ b/native/Avalonia.Native/src/OSX/window.mm @@ -1192,6 +1192,15 @@ NSArray* AllLoopModes = [NSArray arrayWithObjects: NSDefaultRunLoopMode, NSEvent { if([self activateAppropriateChild: true]) { + if(_menu == nullptr) + { + [NSApp setMenu: [NSMenu new]]; + } + else + { + [NSApp setMenu:_menu]; + } + _parent->BaseEvents->Activated(); [super becomeKeyWindow]; }