From 990e06b445efae6ae549a5afd70751c8f18233be Mon Sep 17 00:00:00 2001 From: Carlos Zamora Date: Mon, 4 Jan 2021 16:14:51 -0600 Subject: [PATCH] Polish OpenSettings action for Settings UI and Profile page navigation on refresh (#8670) Performs a number of minor bugfixes related to the Settings UI: - b5370a1 Dropdown bug: - the dropdown would display the keybinding for the first `openSettings` found. So it would accidentally present and bind the one for the Settings UI. - 91eb49e autogenerated name for opening Settings UI: - the Settings UI keybinding would display "open settings file". This was updated to say "Open Settings UI". - 1cadbf4 Profile Page navigation crash: - the selected item off of a MUX navigation view returns a MUX NavViewItem (as opposed to WUX) - dd2f3e5 Hookup delete for Profile page navigation: - missed a spot where we were manually navigating to the Profile page. So it wasn't hooked up properly - 9fea6de Properly cast NavViewItem tags - When we update the NavigationView's menu items, we were casting the tags to `Model::Profile` instead of `Editor::ProfileViewModel`. ## References #6800 - Settings UI epic Fixes the following bug: > - [ ] JSON change --> crash > - open SUI --> open JSON --> edit retro effects in JSON --> save file --> cry because the app crashed ## Additional comments This was a part of some manual testing I performed on the Settings UI. More intricate bugs are being reported on #6800 and will be fixed in their own PR. --- src/cascadia/TerminalApp/TerminalPage.cpp | 4 +++- src/cascadia/TerminalSettingsEditor/MainPage.cpp | 10 +++++----- src/cascadia/TerminalSettingsModel/ActionArgs.cpp | 2 ++ src/cascadia/TerminalSettingsModel/ActionArgs.h | 3 +++ src/cascadia/TerminalSettingsModel/ActionArgs.idl | 1 + .../Resources/en-US/Resources.resw | 3 +++ 6 files changed, 17 insertions(+), 6 deletions(-) diff --git a/src/cascadia/TerminalApp/TerminalPage.cpp b/src/cascadia/TerminalApp/TerminalPage.cpp index 96b04dca6d..335d09bc3d 100644 --- a/src/cascadia/TerminalApp/TerminalPage.cpp +++ b/src/cascadia/TerminalApp/TerminalPage.cpp @@ -602,7 +602,9 @@ namespace winrt::TerminalApp::implementation settingsItem.Click({ this, &TerminalPage::_SettingsButtonOnClick }); newTabFlyout.Items().Append(settingsItem); - auto settingsKeyChord = keyBindings.GetKeyBindingForAction(ShortcutAction::OpenSettings); + Microsoft::Terminal::Settings::Model::OpenSettingsArgs args{ SettingsTarget::SettingsFile }; + Microsoft::Terminal::Settings::Model::ActionAndArgs settingsAction{ ShortcutAction::OpenSettings, args }; + const auto settingsKeyChord{ keyBindings.GetKeyBindingForActionWithArgs(settingsAction) }; if (settingsKeyChord) { _SetAcceleratorForMenuItem(settingsItem, settingsKeyChord); diff --git a/src/cascadia/TerminalSettingsEditor/MainPage.cpp b/src/cascadia/TerminalSettingsEditor/MainPage.cpp index a417779e8c..fb6b12a449 100644 --- a/src/cascadia/TerminalSettingsEditor/MainPage.cpp +++ b/src/cascadia/TerminalSettingsEditor/MainPage.cpp @@ -76,7 +76,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation { if (const auto tag{ navViewItem.Tag() }) { - if (tag.try_as()) + if (tag.try_as()) { // hide NavViewItem pointing to a Profile navViewItem.Visibility(Visibility::Collapsed); @@ -104,13 +104,13 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation { if (const auto tag{ selectedItem.as().Tag() }) { - if (const auto profile{ tag.try_as() }) + if (const auto oldProfile{ tag.try_as() }) { // check if the profile still exists - if (_settingsClone.FindProfile(profile.Guid())) + if (const auto profile{ _settingsClone.FindProfile(oldProfile.Guid()) }) { // Navigate to the page with the given profile - contentFrame().Navigate(xaml_typename(), winrt::make(_viewModelForProfile(profile), _settingsClone.GlobalSettings().ColorSchemes(), *this)); + _Navigate(_viewModelForProfile(profile)); return; } } @@ -126,7 +126,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation // could not find the page we were on, fallback to first menu item const auto firstItem{ navigationMenu.MenuItems().GetAt(0) }; navigationMenu.SelectedItem(firstItem); - if (const auto tag{ navigationMenu.SelectedItem().as().Tag() }) + if (const auto tag{ navigationMenu.SelectedItem().as().Tag() }) { _Navigate(unbox_value(tag)); } diff --git a/src/cascadia/TerminalSettingsModel/ActionArgs.cpp b/src/cascadia/TerminalSettingsModel/ActionArgs.cpp index 04dde967fc..22744cacfa 100644 --- a/src/cascadia/TerminalSettingsModel/ActionArgs.cpp +++ b/src/cascadia/TerminalSettingsModel/ActionArgs.cpp @@ -292,6 +292,8 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation return RS_(L"OpenDefaultSettingsCommandKey"); case SettingsTarget::AllFiles: return RS_(L"OpenBothSettingsFilesCommandKey"); + case SettingsTarget::SettingsUI: + return RS_(L"OpenSettingsUICommandKey"); default: return RS_(L"OpenSettingsCommandKey"); } diff --git a/src/cascadia/TerminalSettingsModel/ActionArgs.h b/src/cascadia/TerminalSettingsModel/ActionArgs.h index 8551288e61..7a249330cf 100644 --- a/src/cascadia/TerminalSettingsModel/ActionArgs.h +++ b/src/cascadia/TerminalSettingsModel/ActionArgs.h @@ -441,6 +441,8 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation struct OpenSettingsArgs : public OpenSettingsArgsT { OpenSettingsArgs() = default; + OpenSettingsArgs(const SettingsTarget& target) : + _Target{ target } {} GETSET_PROPERTY(SettingsTarget, Target, SettingsTarget::SettingsFile); static constexpr std::string_view TargetKey{ "target" }; @@ -850,4 +852,5 @@ namespace winrt::Microsoft::Terminal::Settings::Model::factory_implementation BASIC_FACTORY(CloseOtherTabsArgs); BASIC_FACTORY(CloseTabsAfterArgs); BASIC_FACTORY(MoveTabArgs); + BASIC_FACTORY(OpenSettingsArgs); } diff --git a/src/cascadia/TerminalSettingsModel/ActionArgs.idl b/src/cascadia/TerminalSettingsModel/ActionArgs.idl index 2c539babe3..e4413fbd45 100644 --- a/src/cascadia/TerminalSettingsModel/ActionArgs.idl +++ b/src/cascadia/TerminalSettingsModel/ActionArgs.idl @@ -147,6 +147,7 @@ namespace Microsoft.Terminal.Settings.Model [default_interface] runtimeclass OpenSettingsArgs : IActionArgs { + OpenSettingsArgs(SettingsTarget target); SettingsTarget Target { get; }; }; diff --git a/src/cascadia/TerminalSettingsModel/Resources/en-US/Resources.resw b/src/cascadia/TerminalSettingsModel/Resources/en-US/Resources.resw index da183b249d..88ea5ac30e 100644 --- a/src/cascadia/TerminalSettingsModel/Resources/en-US/Resources.resw +++ b/src/cascadia/TerminalSettingsModel/Resources/en-US/Resources.resw @@ -363,4 +363,7 @@ Break into the debugger + + Open Settings... +