move debugFeaturesEnabled constexpr back to cpp

microsoft · Aug 28, 2020 · 7cd72aa · 7cd72aa
1 parent 615b263
commit 7cd72aa
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/src/cascadia/TerminalApp/CascadiaSettings.cpp b/src/cascadia/TerminalApp/CascadiaSettings.cpp
@@ -53,7 +53,7 @@ CascadiaSettings::CascadiaSettings() :
 // Arguments:
 // - addDynamicProfiles: if true, we'll add the built-in DPGs.
 CascadiaSettings::CascadiaSettings(const bool addDynamicProfiles) :
-    _globals(winrt::make_self<winrt::TerminalApp::implementation::GlobalAppSettings>())
+    _globals{ winrt::make_self<winrt::TerminalApp::implementation::GlobalAppSettings>() }
 {
     if (addDynamicProfiles)
     {

diff --git a/src/cascadia/TerminalApp/GlobalAppSettings.cpp b/src/cascadia/TerminalApp/GlobalAppSettings.cpp
@@ -46,11 +46,18 @@ static constexpr std::string_view ForceFullRepaintRenderingKey{ "experimental.re
 static constexpr std::string_view SoftwareRenderingKey{ "experimental.rendering.software" };
 static constexpr std::string_view ForceVTInputKey{ "experimental.input.forceVT" };
 
+#ifdef _DEBUG
+static constexpr bool debugFeaturesDefault{ true };
+#else
+static constexpr bool debugFeaturesDefault{ false };
+#endif
+
 GlobalAppSettings::GlobalAppSettings() :
     _keybindings{ winrt::make_self<AppKeyBindings>() },
     _keybindingsWarnings{},
     _unparsedDefaultProfile{},
-    _defaultProfile{}
+    _defaultProfile{},
+    _DebugFeaturesEnabled{ debugFeaturesDefault }
 {
     _commands = winrt::single_threaded_map<winrt::hstring, winrt::TerminalApp::Command>();
     _colorSchemes = winrt::single_threaded_map<winrt::hstring, winrt::TerminalApp::ColorScheme>();

diff --git a/src/cascadia/TerminalApp/GlobalAppSettings.h b/src/cascadia/TerminalApp/GlobalAppSettings.h
@@ -21,12 +21,6 @@ Author(s):
 #include "Command.h"
 #include "ColorScheme.h"
 
-#ifdef _DEBUG
-static constexpr bool debugFeaturesDefault{ true };
-#else
-static constexpr bool debugFeaturesDefault{ false };
-#endif
-
 // fwdecl unittest classes
 namespace TerminalAppLocalTests
 {
@@ -80,7 +74,7 @@ namespace winrt::TerminalApp::implementation
         GETSET_PROPERTY(bool, ForceFullRepaintRendering, false);
         GETSET_PROPERTY(bool, SoftwareRendering, false);
         GETSET_PROPERTY(bool, ForceVTInput, false);
-        GETSET_PROPERTY(bool, DebugFeaturesEnabled, debugFeaturesDefault);
+        GETSET_PROPERTY(bool, DebugFeaturesEnabled); // default value set in constructor
         GETSET_PROPERTY(bool, StartOnUserLogin, false);
         GETSET_PROPERTY(bool, AlwaysOnTop, false);
         GETSET_PROPERTY(bool, UseTabSwitcher, true);