Skip to content

Improve text sharpness in DrawingIsland sample #354

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

Merged
merged 4 commits into from
May 10, 2024
Merged

Improve text sharpness in DrawingIsland sample #354

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4cff561
Snap pixels on text surface brush and visual.
niklasb-ms May 10, 2024
856e76e
Disable stretching and alignment in Text's surface brush
achen144 May 10, 2024
1c9eeea
Set visual to size of text surface to disable stretch/alignment
achen144 May 10, 2024
0ea6d9e
Correctly set a text item visual's size to match the surface size.
niklasb-ms May 10, 2024
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
19 changes: 13 additions & 6 deletions Samples/Islands/DrawingIsland/DrawingIslandComponents/TextRenderer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,20 +126,20 @@ namespace winrt::DrawingIslandComponents::implementation
/*maxHeight*/ 0,
/*out*/ textLayout.put()));

// Get the metrics from the text layout, and add the margins to compute the
// width and height of the visual.
// Get the metrics from the text layout.
DWRITE_TEXT_METRICS textMetrics;
winrt::check_hresult(textLayout->GetMetrics(/*out*/ &textMetrics));
const float width = textMetrics.width + (marginLeft + marginRight);
const float height = textMetrics.height + (marginTop + marginBottom);

visual.Size(float2(width, height));
// Compute the size of the drawing surface in pixels.
// This is the text size plus margins, multiplied by the DPI scale and rounded up.
const float pixelWidth = ceilf((textMetrics.width + (marginLeft + marginRight)) * m_dpiScale);
const float pixelHeight = ceilf((textMetrics.height + (marginTop + marginBottom)) * m_dpiScale);

try
{
// Create a composition surface to draw to.
CompositionDrawingSurface drawingSurface = m_compositionGraphicsDevice.CreateDrawingSurface(
winrt::Windows::Foundation::Size(width * m_dpiScale, height * m_dpiScale),
Size(pixelWidth, pixelHeight),
winrt::Microsoft::Graphics::DirectX::DirectXPixelFormat::B8G8R8A8UIntNormalized,
winrt::Microsoft::Graphics::DirectX::DirectXAlphaMode::Premultiplied);
auto drawingSurfaceInterop = drawingSurface.as<ICompositionDrawingSurfaceInterop>();
Expand Down Expand Up @@ -186,6 +186,13 @@ namespace winrt::DrawingIslandComponents::implementation
auto surfaceBrush = m_compositor.CreateSurfaceBrush();
surfaceBrush.Surface(drawingSurface);
visual.Brush(surfaceBrush);

// Set the visual size to match the surface size (but in DIPs rather than pixels).
// This ensures there is no scaling.
visual.Size(Size(pixelWidth / m_dpiScale, pixelHeight / m_dpiScale));

// Ensure the visual is snapped to a pixel boundary.
visual.IsPixelSnappingEnabled(true);
}
catch (winrt::hresult_error& e)
{
Expand Down