bugfix: updating json should propagate to SUI

src/cascadia/TerminalApp/SettingsTab.cpp

@@ -12,6 +12,7 @@ using namespace winrt::Windows::UI::Xaml;
 using namespace winrt::Windows::UI::Core;
 using namespace winrt::Microsoft::Terminal::TerminalControl;
 using namespace winrt::Microsoft::Terminal::Settings::Model;
+using namespace winrt::Microsoft::Terminal::Settings::Editor;
 using namespace winrt::Windows::System;
 
 namespace winrt
@@ -22,7 +23,7 @@ namespace winrt
 
 namespace winrt::TerminalApp::implementation
 {
-    SettingsTab::SettingsTab(winrt::Microsoft::Terminal::Settings::Editor::MainPage settingsUI)
+    SettingsTab::SettingsTab(MainPage settingsUI)
     {
         Content(settingsUI);
 
@@ -31,6 +32,12 @@ namespace winrt::TerminalApp::implementation
         _CreateIcon();
     }
 
+    void SettingsTab::UpdateSettings(CascadiaSettings settings)
+    {
+        auto settingsUI{ Content().as<MainPage>() };
+        settingsUI.UpdateSettings(settings);
+    }
+
     // Method Description:
     // - Focus the settings UI
     // Arguments:

src/cascadia/TerminalApp/SettingsTab.h

@@ -29,6 +29,7 @@ namespace winrt::TerminalApp::implementation
     public:
         SettingsTab(winrt::Microsoft::Terminal::Settings::Editor::MainPage settingsUI);
 
+        void UpdateSettings(Microsoft::Terminal::Settings::Model::CascadiaSettings settings);
         void Focus(winrt::Windows::UI::Xaml::FocusState focusState) override;
 
     private:

src/cascadia/TerminalApp/SettingsTab.idl

@@ -7,5 +7,6 @@ namespace TerminalApp
 {
     [default_interface] runtimeclass SettingsTab : TabBase
     {
+        void UpdateSettings(Microsoft.Terminal.Settings.Model.CascadiaSettings settings);
     }
 }

src/cascadia/TerminalApp/TerminalPage.cpp

@@ -2250,6 +2250,11 @@ namespace winrt::TerminalApp::implementation
                 // Force the TerminalTab to re-grab its currently active control's title.
                 terminalTab->UpdateTitle();
             }
+
+            if (auto settingsTab = tab.try_as<TerminalApp::SettingsTab>())
+            {
+                settingsTab.UpdateSettings(_settings);
+            }
         }
 
         auto weakThis{ get_weak() };

src/cascadia/TerminalSettingsEditor/MainPage.cpp

@@ -47,6 +47,12 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         _InitializeProfilesList();
     }
 
+    void MainPage::UpdateSettings(Model::CascadiaSettings settings)
+    {
+        _settingsSource = settings;
+        _settingsClone = settings.Copy();
+    }
+
     // Function Description:
     // - Called when the NavigationView is loaded. Navigates to the first item in the NavigationView, if no item is selected
     // Arguments:

src/cascadia/TerminalSettingsEditor/MainPage.h

@@ -13,23 +13,25 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         MainPage() = delete;
         MainPage(const Model::CascadiaSettings& settings);
 
+        void UpdateSettings(Model::CascadiaSettings settings);
+
         void OpenJsonKeyDown(Windows::Foundation::IInspectable const& sender, Windows::UI::Xaml::Input::KeyRoutedEventArgs const& args);
         void OpenJsonTapped(Windows::Foundation::IInspectable const& sender, Windows::UI::Xaml::Input::TappedRoutedEventArgs const& args);
         void SettingsNav_Loaded(Windows::Foundation::IInspectable const& sender, Windows::UI::Xaml::RoutedEventArgs const& args);
         void SettingsNav_ItemInvoked(Microsoft::UI::Xaml::Controls::NavigationView const& sender, Microsoft::UI::Xaml::Controls::NavigationViewItemInvokedEventArgs const& args);
         void SaveButton_Click(Windows::Foundation::IInspectable const& sender, Windows::UI::Xaml::RoutedEventArgs const& args);
         void ResetButton_Click(Windows::Foundation::IInspectable const& sender, Windows::UI::Xaml::RoutedEventArgs const& args);
 
-        TYPED_EVENT(OpenJson, winrt::Windows::Foundation::IInspectable, winrt::Microsoft::Terminal::Settings::Model::SettingsTarget);
+        TYPED_EVENT(OpenJson, winrt::Windows::Foundation::IInspectable, Model::SettingsTarget);
 
     private:
-        winrt::Microsoft::Terminal::Settings::Model::CascadiaSettings _settingsSource;
-        winrt::Microsoft::Terminal::Settings::Model::CascadiaSettings _settingsClone;
-        winrt::Windows::Foundation::Collections::IMap<winrt::Microsoft::Terminal::Settings::Model::Profile, winrt::Microsoft::UI::Xaml::Controls::NavigationViewItem> _profileToNavItemMap;
+        Model::CascadiaSettings _settingsSource;
+        Model::CascadiaSettings _settingsClone;
+        winrt::Windows::Foundation::Collections::IMap<Model::Profile, winrt::Microsoft::UI::Xaml::Controls::NavigationViewItem> _profileToNavItemMap;
 
         void _InitializeProfilesList();
         void _CreateAndNavigateToNewProfile(const uint32_t index);
-        winrt::Microsoft::UI::Xaml::Controls::NavigationViewItem _CreateProfileNavViewItem(const winrt::Microsoft::Terminal::Settings::Model::Profile& profile);
+        winrt::Microsoft::UI::Xaml::Controls::NavigationViewItem _CreateProfileNavViewItem(const Model::Profile& profile);
 
         void _Navigate(hstring clickedItemTag);
     };

src/cascadia/TerminalSettingsEditor/MainPage.idl

@@ -7,6 +7,7 @@ namespace Microsoft.Terminal.Settings.Editor
     {
         MainPage(Microsoft.Terminal.Settings.Model.CascadiaSettings settings);
 
+        void UpdateSettings(Microsoft.Terminal.Settings.Model.CascadiaSettings settings);
         event Windows.Foundation.TypedEventHandler<Object, Microsoft.Terminal.Settings.Model.SettingsTarget> OpenJson;
     }
 }