From d45cc4c2e16645e2c832d8d33ee1259ae3d2b7bb Mon Sep 17 00:00:00 2001 From: Carlos Zamora Date: Fri, 22 Jan 2021 15:43:54 -0800 Subject: [PATCH] [Settings UI] Allow renaming a profile (#8837) This adds a "Name" text box to the Profile page in the Settings UI. Any changes to the name/icon are propagated to the relevant NavigationViewItem. Base Layer does not have a "Name". ## References #6800 - Settings UI Epic --- .../TerminalSettingsEditor/MainPage.cpp | 19 +++++++++++++++++++ .../TerminalSettingsEditor/Profiles.xaml | 10 ++++++++++ 2 files changed, 29 insertions(+) diff --git a/src/cascadia/TerminalSettingsEditor/MainPage.cpp b/src/cascadia/TerminalSettingsEditor/MainPage.cpp index e0a8d02ae5..9ab0d7927d 100644 --- a/src/cascadia/TerminalSettingsEditor/MainPage.cpp +++ b/src/cascadia/TerminalSettingsEditor/MainPage.cpp @@ -357,6 +357,25 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation icon.IconSource(iconSource); profileNavItem.Icon(icon); + // Update the menu item when the icon/name changes + auto weakMenuItem{ make_weak(profileNavItem) }; + profile.PropertyChanged([weakMenuItem](const auto&, const WUX::Data::PropertyChangedEventArgs& args) { + if (auto menuItem{ weakMenuItem.get() }) + { + const auto& tag{ menuItem.Tag().as() }; + if (args.PropertyName() == L"Icon") + { + const auto iconSource{ IconPathConverter::IconSourceWUX(tag.Icon()) }; + WUX::Controls::IconSourceElement icon; + icon.IconSource(iconSource); + menuItem.Icon(icon); + } + else if (args.PropertyName() == L"Name") + { + menuItem.Content(box_value(tag.Name())); + } + } + }); return profileNavItem; } diff --git a/src/cascadia/TerminalSettingsEditor/Profiles.xaml b/src/cascadia/TerminalSettingsEditor/Profiles.xaml index 338459e5ca..30a7c1a7dd 100644 --- a/src/cascadia/TerminalSettingsEditor/Profiles.xaml +++ b/src/cascadia/TerminalSettingsEditor/Profiles.xaml @@ -56,6 +56,16 @@ the MIT License. See LICENSE in the project root for license information. --> + + + + + +