Make GlobalAppSettings a WinRT object (#7349)

GlobalAppSettings is now a WinRT object in the TerminalApp project. ## References #7141 - GlobalAppSettings is a settings object #885 - this new settings object will be moved to a new TerminalSettingsModel project ## PR Checklist * [x] Tests passed ## Detailed Description of the Pull Request / Additional comments This one was probably the easiest thus far. The only weird thing is how we handle InitialPosition. Today, we lose a little bit of fidelity when we convert from LaunchPosition (int) --> Point (float) --> RECT (long). The current change converts LaunchPosition (optional<long>) --> InitialPosition (long) --> RECT (long). NOTE: Though I could use LaunchPosition to go directly from TermApp to AppHost, I decided to introduce InitialPosition because LaunchPosition will be a part of TerminalSettingsModel soon. ## Validation Steps Performed - [x] Tests passed - [x] Deployment succeeded
microsoft · Aug 28, 2020 · 7803efa · 7803efa
1 parent a51091c
commit 7803efa
Show file tree

Hide file tree

Showing 21 changed files with 339 additions and 310 deletions.
diff --git a/src/cascadia/LocalTests_TerminalApp/ColorSchemeTests.cpp b/src/cascadia/LocalTests_TerminalApp/ColorSchemeTests.cpp
@@ -195,23 +195,23 @@ namespace TerminalAppLocalTests
 
         CascadiaSettings settings;
 
-        VERIFY_ARE_EQUAL(0u, settings._globals.GetColorSchemes().size());
+        VERIFY_ARE_EQUAL(0u, settings._globals->GetColorSchemes().Size());
         VERIFY_IS_NULL(settings._FindMatchingColorScheme(scheme0Json));
         VERIFY_IS_NULL(settings._FindMatchingColorScheme(scheme1Json));
         VERIFY_IS_NULL(settings._FindMatchingColorScheme(scheme2Json));
         VERIFY_IS_NULL(settings._FindMatchingColorScheme(scheme3Json));
 
         settings._LayerOrCreateColorScheme(scheme0Json);
         {
-            for (auto& kv : settings._globals._colorSchemes)
+            for (auto kv : settings._globals->GetColorSchemes())
             {
                 Log::Comment(NoThrowString().Format(
-                    L"kv:%s->%s", kv.first.data(), kv.second.Name().data()));
+                    L"kv:%s->%s", kv.Key().data(), kv.Value().Name().data()));
             }
-            VERIFY_ARE_EQUAL(1u, settings._globals.GetColorSchemes().size());
+            VERIFY_ARE_EQUAL(1u, settings._globals->GetColorSchemes().Size());
 
-            VERIFY_IS_TRUE(settings._globals._colorSchemes.find(L"scheme0") != settings._globals._colorSchemes.end());
-            auto scheme0Proj = settings._globals._colorSchemes.find(L"scheme0")->second;
+            VERIFY_IS_TRUE(settings._globals->GetColorSchemes().HasKey(L"scheme0"));
+            auto scheme0Proj = settings._globals->GetColorSchemes().Lookup(L"scheme0");
             auto scheme0 = winrt::get_self<ColorScheme>(scheme0Proj);
 
             VERIFY_IS_NOT_NULL(settings._FindMatchingColorScheme(scheme0Json));
@@ -225,13 +225,13 @@ namespace TerminalAppLocalTests
         settings._LayerOrCreateColorScheme(scheme1Json);
 
         {
-            VERIFY_ARE_EQUAL(2u, settings._globals.GetColorSchemes().size());
+            VERIFY_ARE_EQUAL(2u, settings._globals->GetColorSchemes().Size());
 
-            VERIFY_IS_TRUE(settings._globals._colorSchemes.find(L"scheme0") != settings._globals._colorSchemes.end());
-            auto scheme0Proj = settings._globals._colorSchemes.find(L"scheme0")->second;
+            VERIFY_IS_TRUE(settings._globals->GetColorSchemes().HasKey(L"scheme0"));
+            auto scheme0Proj = settings._globals->GetColorSchemes().Lookup(L"scheme0");
             auto scheme0 = winrt::get_self<ColorScheme>(scheme0Proj);
-            VERIFY_IS_TRUE(settings._globals._colorSchemes.find(L"scheme1") != settings._globals._colorSchemes.end());
-            auto scheme1Proj = settings._globals._colorSchemes.find(L"scheme1")->second;
+            VERIFY_IS_TRUE(settings._globals->GetColorSchemes().HasKey(L"scheme1"));
+            auto scheme1Proj = settings._globals->GetColorSchemes().Lookup(L"scheme1");
             auto scheme1 = winrt::get_self<ColorScheme>(scheme1Proj);
 
             VERIFY_IS_NOT_NULL(settings._FindMatchingColorScheme(scheme0Json));
@@ -246,13 +246,13 @@ namespace TerminalAppLocalTests
         settings._LayerOrCreateColorScheme(scheme2Json);
 
         {
-            VERIFY_ARE_EQUAL(2u, settings._globals.GetColorSchemes().size());
+            VERIFY_ARE_EQUAL(2u, settings._globals->GetColorSchemes().Size());
 
-            VERIFY_IS_TRUE(settings._globals._colorSchemes.find(L"scheme0") != settings._globals._colorSchemes.end());
-            auto scheme0Proj = settings._globals._colorSchemes.find(L"scheme0")->second;
+            VERIFY_IS_TRUE(settings._globals->GetColorSchemes().HasKey(L"scheme0"));
+            auto scheme0Proj = settings._globals->GetColorSchemes().Lookup(L"scheme0");
             auto scheme0 = winrt::get_self<ColorScheme>(scheme0Proj);
-            VERIFY_IS_TRUE(settings._globals._colorSchemes.find(L"scheme1") != settings._globals._colorSchemes.end());
-            auto scheme1Proj = settings._globals._colorSchemes.find(L"scheme1")->second;
+            VERIFY_IS_TRUE(settings._globals->GetColorSchemes().HasKey(L"scheme1"));
+            auto scheme1Proj = settings._globals->GetColorSchemes().Lookup(L"scheme1");
             auto scheme1 = winrt::get_self<ColorScheme>(scheme1Proj);
 
             VERIFY_IS_NOT_NULL(settings._FindMatchingColorScheme(scheme0Json));
@@ -267,16 +267,16 @@ namespace TerminalAppLocalTests
         settings._LayerOrCreateColorScheme(scheme3Json);
 
         {
-            VERIFY_ARE_EQUAL(3u, settings._globals.GetColorSchemes().size());
+            VERIFY_ARE_EQUAL(3u, settings._globals->GetColorSchemes().Size());
 
-            VERIFY_IS_TRUE(settings._globals._colorSchemes.find(L"scheme0") != settings._globals._colorSchemes.end());
-            auto scheme0Proj = settings._globals._colorSchemes.find(L"scheme0")->second;
+            VERIFY_IS_TRUE(settings._globals->GetColorSchemes().HasKey(L"scheme0"));
+            auto scheme0Proj = settings._globals->GetColorSchemes().Lookup(L"scheme0");
             auto scheme0 = winrt::get_self<ColorScheme>(scheme0Proj);
-            VERIFY_IS_TRUE(settings._globals._colorSchemes.find(L"scheme1") != settings._globals._colorSchemes.end());
-            auto scheme1Proj = settings._globals._colorSchemes.find(L"scheme1")->second;
+            VERIFY_IS_TRUE(settings._globals->GetColorSchemes().HasKey(L"scheme1"));
+            auto scheme1Proj = settings._globals->GetColorSchemes().Lookup(L"scheme1");
             auto scheme1 = winrt::get_self<ColorScheme>(scheme1Proj);
-            VERIFY_IS_TRUE(settings._globals._colorSchemes.find(L"") != settings._globals._colorSchemes.end());
-            auto scheme2Proj = settings._globals._colorSchemes.find(L"")->second;
+            VERIFY_IS_TRUE(settings._globals->GetColorSchemes().HasKey(L""));
+            auto scheme2Proj = settings._globals->GetColorSchemes().Lookup(L"");
             auto scheme2 = winrt::get_self<ColorScheme>(scheme2Proj);
 
             VERIFY_IS_NOT_NULL(settings._FindMatchingColorScheme(scheme0Json));