Fix font axes/features not working on DPI change

src/renderer/dx/DxFontRenderData.cpp

@@ -178,12 +178,46 @@ DxFontRenderData::DxFontRenderData(::Microsoft::WRL::ComPtr<IDWriteFactory1> dwr
 
 // Routine Description:
 // - Updates the font used for drawing
+// - This version is to be called when no features/axes were supplied, in which case we will
+//   use the ones we already know about (if any)
 // Arguments:
 // - desired - Information specifying the font that is requested
 // - actual - Filled with the nearest font actually chosen for drawing
 // - dpi - The DPI of the screen
 // Return Value:
 // - S_OK or relevant DirectX error
+[[nodiscard]] HRESULT DxFontRenderData::UpdateFont(const FontInfoDesired& desired, FontInfo& actual, const int dpi) noexcept
+{
+    try
+    {
+        _userLocaleName.clear();
+        _textFormatMap.clear();
+        _fontFaceMap.clear();
+        _boxDrawingEffect.Reset();
+
+        // Initialize the default font info and build everything from here.
+        _defaultFontInfo = DxFontInfo(desired.GetFaceName(),
+                                      desired.GetWeight(),
+                                      DWRITE_FONT_STYLE_NORMAL,
+                                      DWRITE_FONT_STRETCH_NORMAL);
+
+        _BuildFontRenderData(desired, actual, dpi);
+    }
+    CATCH_RETURN();
+
+    return S_OK;
+}
+
+// Routine Description:
+// - Updates the font used for drawing
+// Arguments:
+// - desired - Information specifying the font that is requested
+// - actual - Filled with the nearest font actually chosen for drawing
+// - dpi - The DPI of the screen
+// - features - The font features to apply
+// - axes - The font axes to apply
+// Return Value:
+// - S_OK or relevant DirectX error
 [[nodiscard]] HRESULT DxFontRenderData::UpdateFont(const FontInfoDesired& desired, FontInfo& actual, const int dpi, const std::unordered_map<std::wstring_view, uint32_t>& features, const std::unordered_map<std::wstring_view, float>& axes) noexcept
 {
     try

src/renderer/dx/DxFontRenderData.h

@@ -83,7 +83,8 @@ namespace Microsoft::Console::Render
                                                                                      DWRITE_FONT_STYLE style,
                                                                                      DWRITE_FONT_STRETCH stretch);
 
-        [[nodiscard]] HRESULT UpdateFont(const FontInfoDesired& desired, FontInfo& fiFontInfo, const int dpi, const std::unordered_map<std::wstring_view, uint32_t>& features = {}, const std::unordered_map<std::wstring_view, float>& axes = {}) noexcept;
+        [[nodiscard]] HRESULT UpdateFont(const FontInfoDesired& desired, FontInfo& fiFontInfo, const int dpi) noexcept;
+        [[nodiscard]] HRESULT UpdateFont(const FontInfoDesired& desired, FontInfo& fiFontInfo, const int dpi, const std::unordered_map<std::wstring_view, uint32_t>& features, const std::unordered_map<std::wstring_view, float>& axes) noexcept;
 
         [[nodiscard]] static HRESULT STDMETHODCALLTYPE s_CalculateBoxEffect(IDWriteTextFormat* format, size_t widthPixels, IDWriteFontFace1* face, float fontScale, IBoxDrawingEffect** effect) noexcept;
 

src/renderer/dx/DxRenderer.cpp

@@ -1987,7 +1987,18 @@ CATCH_RETURN()
 // - S_OK or relevant DirectX error
 [[nodiscard]] HRESULT DxEngine::UpdateFont(const FontInfoDesired& pfiFontInfoDesired, FontInfo& fiFontInfo) noexcept
 {
-    return UpdateFont(pfiFontInfoDesired, fiFontInfo, {}, {});
+    try
+    {
+        // If no font features or axes were supplied, we call the version of UpdateFont that
+        // tells the DxFontRenderData to continue using the features/axes it already has (if any)
+        RETURN_IF_FAILED(_fontRenderData->UpdateFont(pfiFontInfoDesired, fiFontInfo, _dpi));
+
+        // Prepare the text layout.
+        _customLayout = WRL::Make<CustomTextLayout>(_fontRenderData.get());
+
+        return S_OK;
+    }
+    CATCH_RETURN();
 }
 
 // Routine Description: