Skip to content

Fix language menu requiring two clicks in the Avalonia GUI #999

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
mnadareski merged 2 commits into from
Jul 2, 2026
Merged

Fix language menu requiring two clicks in the Avalonia GUI #999

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
6dd892c
Fix language menu requiring two clicks in the Avalonia GUI
gmipf Jun 27, 2026
3eb746f
Merge origin/master into pr/5-language-menu-toggle
gmipf Jul 2, 2026
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
1 change: 1 addition & 0 deletions CHANGELIST.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
- Add live tool output console for the Linux GUI (gmipf)
- Normalize null checks in recent code
- Cleanup around Avalonia code
- Fix language menu requiring two clicks in the Avalonia GUI (gmipf)

### 3.8.2 (2026-07-01)

Expand Down
29 changes: 17 additions & 12 deletions MPF.Avalonia/Windows/MainWindow.axaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,18 +71,23 @@
<StackPanel Grid.Column="2" Orientation="Horizontal" VerticalAlignment="Stretch">
<Menu x:Name="LanguagesMenuBar" Height="26" VerticalAlignment="Center" Background="Transparent" FontSize="12">
<MenuItem x:Name="LanguagesMenuItem" Header="ENG">
<MenuItem x:Name="EnglishMenuItem" Header="English" />
<MenuItem x:Name="GermanMenuItem" Header="Deutsch" />
<MenuItem x:Name="SpanishMenuItem" Header="Español" />
<MenuItem x:Name="FrenchMenuItem" Header="Français" />
<MenuItem x:Name="ItalianMenuItem" Header="Italiano" />
<MenuItem x:Name="JapaneseMenuItem" Header="日本語" />
<MenuItem x:Name="KoreanMenuItem" Header="한국어" />
<MenuItem x:Name="PolishMenuItem" Header="Polski" />
<MenuItem x:Name="PortugueseMenuItem" Header="Português" />
<MenuItem x:Name="RussianMenuItem" Header="Русский" />
<MenuItem x:Name="SwedishMenuItem" Header="Svenska" />
<MenuItem x:Name="UkrainianMenuItem" Header="Українська" />
<!-- ToggleType="CheckBox" mirrors the WPF GUI's IsCheckable="True" on these
items. Without it an Avalonia MenuItem never toggles IsChecked on click,
so the shared LanguageMenuItemClick handler (which reads IsChecked to tell
a first selection from re-clicking the active language) needed two clicks
and never showed the active-language check mark. -->
<MenuItem x:Name="EnglishMenuItem" Header="English" ToggleType="CheckBox" />
<MenuItem x:Name="GermanMenuItem" Header="Deutsch" ToggleType="CheckBox" />
<MenuItem x:Name="SpanishMenuItem" Header="Español" ToggleType="CheckBox" />
<MenuItem x:Name="FrenchMenuItem" Header="Français" ToggleType="CheckBox" />
<MenuItem x:Name="ItalianMenuItem" Header="Italiano" ToggleType="CheckBox" />
<MenuItem x:Name="JapaneseMenuItem" Header="日本語" ToggleType="CheckBox" />
<MenuItem x:Name="KoreanMenuItem" Header="한국어" ToggleType="CheckBox" />
<MenuItem x:Name="PolishMenuItem" Header="Polski" ToggleType="CheckBox" />
<MenuItem x:Name="PortugueseMenuItem" Header="Português" ToggleType="CheckBox" />
<MenuItem x:Name="RussianMenuItem" Header="Русский" ToggleType="CheckBox" />
<MenuItem x:Name="SwedishMenuItem" Header="Svenska" ToggleType="CheckBox" />
<MenuItem x:Name="UkrainianMenuItem" Header="Українська" ToggleType="CheckBox" />
</MenuItem>
</Menu>
<Button x:Name="MinimizeButton" Classes="titlebar-button" Width="34" MinHeight="26" Padding="0" Margin="0" CornerRadius="0" Click="MinimizeButtonClick">
Expand Down