File tree Expand file tree Collapse file tree 2 files changed +10
-5
lines changed Expand file tree Collapse file tree 2 files changed +10
-5
lines changed Original file line number Diff line number Diff line change @@ -304,7 +304,7 @@ public bool StaysOpenOnClick
304
304
bool IMenuItem . IsPointerOverSubMenu => _popup ? . IsPointerOverPopup ?? false ;
305
305
306
306
/// <inheritdoc/>
307
- IMenuElement ? IMenuItem . Parent => this . FindLogicalAncestorOfType < IMenuElement > ( ) ;
307
+ IMenuElement ? IMenuItem . Parent => Parent as IMenuElement ;
308
308
309
309
protected override bool IsEnabledCore => base . IsEnabledCore && _commandCanExecute ;
310
310
Original file line number Diff line number Diff line change 1
1
using System . Collections . Generic ;
2
+ using Avalonia . Collections ;
2
3
using Avalonia . Controls ;
3
4
using Avalonia . Controls . Platform ;
4
5
@@ -15,13 +16,15 @@ public void SetNativeMenu(NativeMenu? nativeMenu)
15
16
_nativeMenu = nativeMenu ;
16
17
}
17
18
18
- private IEnumerable < MenuItem > Populate ( NativeMenu nativeMenu )
19
+ private AvaloniaList < MenuItem > Populate ( NativeMenu nativeMenu )
19
20
{
21
+ var result = new AvaloniaList < MenuItem > ( ) ;
22
+
20
23
foreach ( var menuItem in nativeMenu . Items )
21
24
{
22
25
if ( menuItem is NativeMenuItemSeparator )
23
26
{
24
- yield return new MenuItem { Header = "-" } ;
27
+ result . Add ( new MenuItem { Header = "-" } ) ;
25
28
}
26
29
else if ( menuItem is NativeMenuItem item )
27
30
{
@@ -36,12 +39,14 @@ private IEnumerable<MenuItem> Populate(NativeMenu nativeMenu)
36
39
newItem . Click += ( _ , __ ) => bridge . RaiseClicked ( ) ;
37
40
}
38
41
39
- yield return newItem ;
42
+ result . Add ( newItem ) ;
40
43
}
41
44
}
45
+
46
+ return result ;
42
47
}
43
48
44
- public IEnumerable < MenuItem > ? GetMenu ( )
49
+ public AvaloniaList < MenuItem > ? GetMenu ( )
45
50
{
46
51
if ( _nativeMenu != null )
47
52
{
You can’t perform that action at this time.
0 commit comments