Revert TSM to upstream

microsoft · Dec 11, 2020 · 81a50de · 81a50de
1 parent 6604883
commit 81a50de
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/src/cascadia/TerminalSettingsModel/Microsoft.Terminal.Settings.ModelLib.vcxproj b/src/cascadia/TerminalSettingsModel/Microsoft.Terminal.Settings.ModelLib.vcxproj
@@ -214,4 +214,4 @@
   </Target>
 
   <Import Project="$(SolutionDir)build\rules\CollectWildcardResources.targets" />
-</Project>
+</Project>
diff --git a/src/cascadia/TerminalSettingsModel/Microsoft.Terminal.Settings.ModelLib.vcxproj.filters b/src/cascadia/TerminalSettingsModel/Microsoft.Terminal.Settings.ModelLib.vcxproj.filters
@@ -89,4 +89,4 @@
       <UniqueIdentifier>{81a6314f-aa5b-4533-a499-13bc3a5c4af0}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
-</Project>
+</Project>
diff --git a/src/cascadia/TerminalSettingsModel/Profile.idl b/src/cascadia/TerminalSettingsModel/Profile.idl
@@ -18,7 +18,8 @@ namespace Microsoft.Terminal.Settings.Model
         All = 0xffffffff
     };
 
-    [flags] enum ConvergedAlignment {
+    [flags]
+    enum ConvergedAlignment {
         // low 4 bits are the horizontal
         Horizontal_Center = 0x00,
         Horizontal_Left = 0x01,

diff --git a/src/cascadia/TerminalSettingsModel/TerminalSettingsSerializationHelpers.h b/src/cascadia/TerminalSettingsModel/TerminalSettingsSerializationHelpers.h
@@ -78,6 +78,7 @@ JSON_FLAG_MAPPER(::winrt::Microsoft::Terminal::Settings::Model::BellStyle)
 
 JSON_ENUM_MAPPER(::winrt::Microsoft::Terminal::Settings::Model::ConvergedAlignment)
 {
+    // reduce repetition
     static constexpr std::array<pair_type, 9> mappings = {
         pair_type{ "center", ValueType::Horizontal_Center | ValueType::Vertical_Center },
         pair_type{ "topLeft", ValueType::Horizontal_Left | ValueType::Vertical_Top },
@@ -167,7 +168,7 @@ struct ::Microsoft::Terminal::Settings::Model::JsonUtils::ConversionTrait<::winr
         }
 
         ::winrt::Windows::UI::Text::FontWeight weight{
-            static_cast<uint16_t>(std::clamp(value, 1u, 999u))
+            static_cast<uint16_t>(std::clamp(value, 100u, 990u))
         };
         return weight;
     }