Merge branch 'dev/miniksa/plural_dirty_rects' into dev/miniksa/bitmap

This commit is contained in:
Michael Niksa
2020-03-09 14:26:57 -07:00
2 changed files with 2 additions and 2 deletions

View File

@@ -1689,7 +1689,7 @@ float DxEngine::GetScaling() const noexcept
// - <none>
// Return Value:
// - Rectangle describing dirty area in characters.
[[nodiscard]] std::vector<SMALL_RECT> DxEngine::GetDirtyArea() noexcept
[[nodiscard]] std::vector<SMALL_RECT> DxEngine::GetDirtyArea()
{
return { til::rectangle{} };
}

View File

@@ -98,7 +98,7 @@ namespace Microsoft::Console::Render
[[nodiscard]] HRESULT GetProposedFont(const FontInfoDesired& fiFontInfoDesired, FontInfo& fiFontInfo, int const iDpi) noexcept override;
[[nodiscard]] std::vector<SMALL_RECT> GetDirtyArea() noexcept override;
[[nodiscard]] std::vector<SMALL_RECT> GetDirtyArea() override;
[[nodiscard]] HRESULT GetFontSize(_Out_ COORD* const pFontSize) noexcept override;
[[nodiscard]] HRESULT IsGlyphWideByFont(const std::wstring_view glyph, _Out_ bool* const pResult) noexcept override;