Skip to content

[Avalonia] Improve the menu items hotkey look and feel. Fixes #904 #905

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

Merged
KirillOsenkov merged 2 commits into from
Sep 23, 2025
+14 −27
Merged

[Avalonia] Improve the menu items hotkey look and feel. Fixes #904 #905

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
51aef34
Add InputGesture atttibute to MenuItems in order to display hotkeys i…
snechaev Sep 23, 2025
c2ab6b8
Do not handle the menuitems-assigned hotkeys manually. This fix shoul…
snechaev Sep 23, 2025
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
19 changes: 13 additions & 6 deletions src/StructuredLogViewer.Avalonia/MainWindow.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,20 +15,26 @@
<Separator />
<MenuItem Name="Build"
Header="_Build Solution/Project..."
HotKey="F6" />
HotKey="F6"
InputGesture="F6"/>
<MenuItem Name="Rebuild"
Header="Rebuild Solution/Project"
HotKey="Shift+F6" />
HotKey="Shift+F6"
InputGesture="Shift+F6"/>
<Separator />
<MenuItem Name="Open"
Header="_Open Log..."
HotKey="Ctrl+O" />
HotKey="Ctrl+O"
InputGesture="Ctrl+O"/>
<MenuItem Name="ReloadMenu"
Header="_Reload"
HotKey="F5" />
HotKey="F5"
InputGesture="F5"/>
<MenuItem Name="SaveAsMenu"
Header="_Save Log As..."
HotKey="Ctrl+S" />
HotKey="Ctrl+S"
InputGesture="Ctrl+S"
/>
<Separator />
<MenuItem Name="RecentProjectsMenu"
Header="Recent Projects"
Expand All @@ -45,7 +51,8 @@
<Separator />
<MenuItem Name="Exit"
Header="E_xit"
HotKey="Alt+F4" />
HotKey="Alt+F4"
InputGesture="Alt+F4"/>
</MenuItem>
<MenuItem Header="_Help">
<MenuItem Name="HelpLink"
Expand Down
22 changes: 1 addition & 21 deletions src/StructuredLogViewer.Avalonia/MainWindow.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -518,23 +518,7 @@ await System.Threading.Tasks.Task.Run(() =>

private async void Window_KeyUp(object sender, KeyEventArgs e)
{
if (e.Key == Key.F5)
{
Reload();
}
else if (e.Key == Key.F6 && e.KeyModifiers.HasFlag(KeyModifiers.Shift))
{
RebuildProjectOrSolution();
}
else if (e.Key == Key.F6)
{
await OpenProjectOrSolution();
}
else if (e.Key == Key.O && e.KeyModifiers.HasFlag(KeyModifiers.Control))
{
await OpenLogFile();
}
else if (e.Key == Key.F && e.KeyModifiers.HasFlag(KeyModifiers.Control))
if (e.Key == Key.F && e.KeyModifiers.HasFlag(KeyModifiers.Control))
{
FocusSearch();
}
Expand All @@ -546,10 +530,6 @@ private async void Window_KeyUp(object sender, KeyEventArgs e)
await Clipboard.SetTextAsync(content.MSBuildCommandLine);
}
}
else if (e.Key == Key.S && e.KeyModifiers.HasFlag(KeyModifiers.Control))
{
_ = SaveAs();
}
}

private void FocusSearch()
Expand Down