Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Introduce DxFontInfo #9201

Merged
21 commits merged into from
Jun 22, 2021
Merged

Introduce DxFontInfo #9201

Show file tree
Hide file tree
Changes from 18 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
eaf86b0
Introduce DxFontInfo
skyline75489 Feb 18, 2021
b1fc5be
Format
skyline75489 Feb 18, 2021
6b748f8
Merge branch 'main' into chesterliu/dev/init-dxfontinfo
skyline75489 Mar 2, 2021
bf1da37
Merge branch 'main' into chesterliu/dev/init-dxfontinfo
skyline75489 Mar 15, 2021
b2b548b
Merge branch 'main' into chesterliu/dev/init-dxfontinfo
skyline75489 Apr 8, 2021
a877bac
Merge branch 'main' into chesterliu/dev/init-dxfontinfo
skyline75489 Apr 9, 2021
8456d81
clean
skyline75489 Apr 9, 2021
6a61d45
Merge branch 'main' into chesterliu/dev/init-dxfontinfo
skyline75489 Apr 15, 2021
4f5e4fc
Feedback
skyline75489 Apr 15, 2021
04bbcda
[skip ci] private method naming
skyline75489 Apr 16, 2021
d1d587c
Merge branch 'main' into chesterliu/dev/init-dxfontinfo
skyline75489 Apr 28, 2021
1265742
Merge branch 'main' into chesterliu/dev/init-dxfontinfo
skyline75489 Apr 29, 2021
f381934
Refactor
skyline75489 May 6, 2021
eb581a4
Audit
skyline75489 May 6, 2021
789d33c
Merge branch 'main' into chesterliu/dev/init-dxfontinfo
skyline75489 Jun 1, 2021
c4ab9b5
Fix merge
skyline75489 Jun 7, 2021
03e56df
Merge branch 'main' into chesterliu/dev/init-dxfontinfo
skyline75489 Jun 15, 2021
26a489b
Fix ControlUnitTests
skyline75489 Jun 18, 2021
2f6c091
Merge branch 'main' into chesterliu/dev/init-dxfontinfo
skyline75489 Jun 18, 2021
a59757a
Handle first font resolve attempt correctly
skyline75489 Jun 18, 2021
806eef4
Feedback
skyline75489 Jun 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/cascadia/UnitTests_Control/MockControlSettings.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ namespace ControlUnitTests
WINRT_PROPERTY(winrt::hstring, FontFace, L"Consolas");
WINRT_PROPERTY(int32_t, FontSize, DEFAULT_FONT_SIZE);

WINRT_PROPERTY(winrt::Windows::UI::Text::FontWeight, FontWeight);
WINRT_PROPERTY(winrt::Windows::UI::Text::FontWeight, FontWeight, 400);
skyline75489 marked this conversation as resolved.
Show resolved Hide resolved

WINRT_PROPERTY(winrt::hstring, BackgroundImage);
WINRT_PROPERTY(double, BackgroundImageOpacity, 1.0);
Expand Down
16 changes: 14 additions & 2 deletions src/renderer/dx/CustomTextLayout.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,10 +133,21 @@ CATCH_RETURN()
_In_ IDWriteTextRenderer* renderer,
FLOAT originX,
FLOAT originY) noexcept
try
{
const auto drawingContext = static_cast<const DrawingContext*>(clientDrawingContext);
_formatInUse = drawingContext->useItalicFont ? _fontRenderData->ItalicTextFormat().Get() : _fontRenderData->DefaultTextFormat().Get();
_fontInUse = drawingContext->useItalicFont ? _fontRenderData->ItalicFontFace().Get() : _fontRenderData->DefaultFontFace().Get();

const DWRITE_FONT_WEIGHT weight = _fontRenderData->DefaultFontWeight();
DWRITE_FONT_STYLE style = _fontRenderData->DefaultFontStyle();
const DWRITE_FONT_STRETCH stretch = _fontRenderData->DefaultFontStretch();

if (drawingContext->useItalicFont)
{
style = DWRITE_FONT_STYLE_ITALIC;
}

_formatInUse = _fontRenderData->TextFormatWithAttribute(weight, style, stretch).Get();
Copy link
Collaborator Author

@skyline75489 skyline75489 May 6, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

After some consideration I decided to refactor this using std::unordered_map, which makes it super easy to add new attributed font. This is how bold is done:

if (drawingContext->useBoldFont)
{
    // TODO: "relative" bold?
    weight = DWRITE_FONT_WEIGHT_BOLD;
}

if (drawingContext->useItalicFont)
{
    style = DWRITE_FONT_STYLE_ITALIC;
}

_formatInUse = _fontRenderData->TextFormatWithAttribute(weight, style, stretch).Get();
_fontInUse = _fontRenderData->FontFaceWithAttribute(weight, style, stretch).Get();

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this is really close to @DHowett 's vision in #8580 (comment), if I understand it correctly.

_fontInUse = _fontRenderData->FontFaceWithAttribute(weight, style, stretch).Get();

RETURN_IF_FAILED(_AnalyzeTextComplexity());
RETURN_IF_FAILED(_AnalyzeRuns());
Expand All @@ -151,6 +162,7 @@ CATCH_RETURN()

return S_OK;
}
CATCH_RETURN()
skyline75489 marked this conversation as resolved.
Show resolved Hide resolved

// Routine Description:
// - Uses the internal text information and the analyzers/font information from construction
Expand Down
Loading