From 2e34c4ee3d1832731053b2d93ac5022e6486ff8e Mon Sep 17 00:00:00 2001 From: Ben Olden-Cooligan Date: Sun, 2 Feb 2025 09:03:35 -0800 Subject: [PATCH] WinForms: Fix ampersands in profiles toolbar #471 --- NAPS2.Lib.WinForms/EtoForms/Ui/WinFormsDesktopForm.cs | 5 +++-- NAPS2.Lib/EtoForms/Ui/DesktopForm.cs | 1 - 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/NAPS2.Lib.WinForms/EtoForms/Ui/WinFormsDesktopForm.cs b/NAPS2.Lib.WinForms/EtoForms/Ui/WinFormsDesktopForm.cs index 26aa206226..8c7ad45e0a 100644 --- a/NAPS2.Lib.WinForms/EtoForms/Ui/WinFormsDesktopForm.cs +++ b/NAPS2.Lib.WinForms/EtoForms/Ui/WinFormsDesktopForm.cs @@ -212,9 +212,10 @@ protected override void UpdateProfilesToolbar() var profile = profiles[i]; var item = toolbarItems[i]; item.Tag = profile; - if (item.Text != profile.DisplayName) + var text = profile.DisplayName.Replace("&", "&&"); + if (item.Text != text) { - item.Text = profile.DisplayName; + item.Text = text; } } } diff --git a/NAPS2.Lib/EtoForms/Ui/DesktopForm.cs b/NAPS2.Lib/EtoForms/Ui/DesktopForm.cs index e2fcd2cb93..01a625955e 100644 --- a/NAPS2.Lib/EtoForms/Ui/DesktopForm.cs +++ b/NAPS2.Lib/EtoForms/Ui/DesktopForm.cs @@ -541,7 +541,6 @@ private void UpdateScanButton() var commandList = _profileManager.Profiles.Select(profile => new ActionCommand(() => _desktopScanController.ScanWithProfile(profile)) { - // TODO: Does this need to change on non-WinForms? MenuText = profile.DisplayName.Replace("&", "&&"), IconName = profile == defaultProfile ? "accept_small" : null })