Skip to content
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

fix exception in menuitem extension #156

Merged
merged 3 commits into from
Nov 30, 2024
Merged

fix exception in menuitem extension #156

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f320cab
fix exception in menuitem extension
tomlm Nov 30, 2024
feaf175
Automated JetBrains cleanup
github-actions[bot] Nov 30, 2024
0a2575c
Merge branch 'main' into tomlm/issue151
tomlm Nov 30, 2024
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
13 changes: 8 additions & 5 deletions src/Consolonia.Themes.TurboVision/Templates/Controls/Helpers/MenuExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,16 @@ static MenuExtensions()
var focusedControl =
(Control)AvaloniaLocator.Current.GetRequiredService<IFocusManager>()!
.GetFocusedElement();
var menuItems = visual.GetLogicalAncestors().OfType<MenuItem>();

var focusedTree = focusedControl!.GetLogicalAncestors();
if (focusedControl != null)
{
var focusedTree = focusedControl.GetLogicalAncestors();
var menuItems = visual.GetLogicalAncestors().OfType<MenuItem>();

foreach (MenuItem menuItem in menuItems.Where(item => !focusedTree.Contains(item))
.ToArray())
menuItem.Close();
foreach (MenuItem menuItem in menuItems.Where(item => !focusedTree.Contains(item))
.ToArray())
menuItem.Close();
}
});
}));
visual.SetValue(DisposablesProperty, new[] { disposable });
Expand Down
Loading