From 761203d95e94987aaaa20cff28fdf01268d3604b Mon Sep 17 00:00:00 2001 From: PankajBhojwani Date: Thu, 4 Nov 2021 12:50:59 -0700 Subject: [PATCH] Remove unused rendering settings from profile (#11685) The `ForceFullRepaintRendering` and `SoftwareRendering` are global only and for some reason were in profile. This commit removes them. Reference: https://github.com/microsoft/terminal/pull/11416#discussion_r742030103 --- src/cascadia/TerminalSettingsEditor/Profiles.h | 2 -- src/cascadia/TerminalSettingsEditor/Profiles.idl | 2 -- src/cascadia/TerminalSettingsModel/CascadiaSettings.cpp | 2 -- src/cascadia/TerminalSettingsModel/Profile.cpp | 2 -- src/cascadia/TerminalSettingsModel/Profile.h | 4 ---- src/cascadia/TerminalSettingsModel/Profile.idl | 2 -- 6 files changed, 14 deletions(-) diff --git a/src/cascadia/TerminalSettingsEditor/Profiles.h b/src/cascadia/TerminalSettingsEditor/Profiles.h index 2bcbb1ca3..40ecd9c45 100644 --- a/src/cascadia/TerminalSettingsEditor/Profiles.h +++ b/src/cascadia/TerminalSettingsEditor/Profiles.h @@ -86,8 +86,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation OBSERVABLE_PROJECTED_SETTING(_profile, Commandline); OBSERVABLE_PROJECTED_SETTING(_profile, StartingDirectory); OBSERVABLE_PROJECTED_SETTING(_profile, AntialiasingMode); - OBSERVABLE_PROJECTED_SETTING(_profile, ForceFullRepaintRendering); - OBSERVABLE_PROJECTED_SETTING(_profile, SoftwareRendering); OBSERVABLE_PROJECTED_SETTING(_profile.DefaultAppearance(), Foreground); OBSERVABLE_PROJECTED_SETTING(_profile.DefaultAppearance(), Background); OBSERVABLE_PROJECTED_SETTING(_profile.DefaultAppearance(), SelectionBackground); diff --git a/src/cascadia/TerminalSettingsEditor/Profiles.idl b/src/cascadia/TerminalSettingsEditor/Profiles.idl index 482a19671..5d45a612c 100644 --- a/src/cascadia/TerminalSettingsEditor/Profiles.idl +++ b/src/cascadia/TerminalSettingsEditor/Profiles.idl @@ -53,8 +53,6 @@ namespace Microsoft.Terminal.Settings.Editor OBSERVABLE_PROJECTED_PROFILE_SETTING(String, Commandline); OBSERVABLE_PROJECTED_PROFILE_SETTING(String, StartingDirectory); OBSERVABLE_PROJECTED_PROFILE_SETTING(Microsoft.Terminal.Control.TextAntialiasingMode, AntialiasingMode); - OBSERVABLE_PROJECTED_PROFILE_SETTING(Boolean, ForceFullRepaintRendering); - OBSERVABLE_PROJECTED_PROFILE_SETTING(Boolean, SoftwareRendering); OBSERVABLE_PROJECTED_PROFILE_SETTING(Windows.Foundation.IReference, Foreground); OBSERVABLE_PROJECTED_PROFILE_SETTING(Windows.Foundation.IReference, Background); OBSERVABLE_PROJECTED_PROFILE_SETTING(Windows.Foundation.IReference, SelectionBackground); diff --git a/src/cascadia/TerminalSettingsModel/CascadiaSettings.cpp b/src/cascadia/TerminalSettingsModel/CascadiaSettings.cpp index e35b3e4b7..2d397ad55 100644 --- a/src/cascadia/TerminalSettingsModel/CascadiaSettings.cpp +++ b/src/cascadia/TerminalSettingsModel/CascadiaSettings.cpp @@ -287,8 +287,6 @@ Model::Profile CascadiaSettings::DuplicateProfile(const Model::Profile& source) DUPLICATE_SETTING_MACRO(Commandline); DUPLICATE_SETTING_MACRO(StartingDirectory); DUPLICATE_SETTING_MACRO(AntialiasingMode); - DUPLICATE_SETTING_MACRO(ForceFullRepaintRendering); - DUPLICATE_SETTING_MACRO(SoftwareRendering); DUPLICATE_SETTING_MACRO(HistorySize); DUPLICATE_SETTING_MACRO(SnapOnInput); DUPLICATE_SETTING_MACRO(AltGrAliasing); diff --git a/src/cascadia/TerminalSettingsModel/Profile.cpp b/src/cascadia/TerminalSettingsModel/Profile.cpp index c7b104e9a..f56e99d4a 100644 --- a/src/cascadia/TerminalSettingsModel/Profile.cpp +++ b/src/cascadia/TerminalSettingsModel/Profile.cpp @@ -104,8 +104,6 @@ winrt::com_ptr Profile::CopySettings() const profile->_Hidden = _Hidden; profile->_TabColor = _TabColor; profile->_Padding = _Padding; - profile->_ForceFullRepaintRendering = _ForceFullRepaintRendering; - profile->_SoftwareRendering = _SoftwareRendering; profile->_Origin = _Origin; profile->_FontInfo = *fontInfo; profile->_DefaultAppearance = *defaultAppearance; diff --git a/src/cascadia/TerminalSettingsModel/Profile.h b/src/cascadia/TerminalSettingsModel/Profile.h index b828165a2..db715f07a 100644 --- a/src/cascadia/TerminalSettingsModel/Profile.h +++ b/src/cascadia/TerminalSettingsModel/Profile.h @@ -112,10 +112,6 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation INHERITABLE_NULLABLE_SETTING(Model::Profile, Microsoft::Terminal::Core::Color, TabColor, nullptr); INHERITABLE_SETTING(Model::Profile, Model::IAppearanceConfig, UnfocusedAppearance, nullptr); - // Global settings - INHERITABLE_SETTING(Model::Profile, bool, ForceFullRepaintRendering, false); - INHERITABLE_SETTING(Model::Profile, bool, SoftwareRendering, false); - // Settings that cannot be put in the macro because of how they are handled in ToJson/LayerJson INHERITABLE_SETTING(Model::Profile, hstring, Name, L"Default"); INHERITABLE_SETTING(Model::Profile, hstring, Source); diff --git a/src/cascadia/TerminalSettingsModel/Profile.idl b/src/cascadia/TerminalSettingsModel/Profile.idl index 670303ff1..746caad25 100644 --- a/src/cascadia/TerminalSettingsModel/Profile.idl +++ b/src/cascadia/TerminalSettingsModel/Profile.idl @@ -74,8 +74,6 @@ namespace Microsoft.Terminal.Settings.Model INHERITABLE_PROFILE_SETTING(IAppearanceConfig, UnfocusedAppearance); INHERITABLE_PROFILE_SETTING(Microsoft.Terminal.Control.TextAntialiasingMode, AntialiasingMode); - INHERITABLE_PROFILE_SETTING(Boolean, ForceFullRepaintRendering); - INHERITABLE_PROFILE_SETTING(Boolean, SoftwareRendering); INHERITABLE_PROFILE_SETTING(Int32, HistorySize); INHERITABLE_PROFILE_SETTING(Boolean, SnapOnInput);