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

Fix RTL regression (fixes #4779) #5734

Merged
3 commits merged into from
May 4, 2020
Merged

Fix RTL regression (fixes #4779) #5734

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8cf1603
Fix RTL regression (fixes #4779)
schorrm May 4, 2020
6f17240
Apply suggestions from code review
zadjii-msft May 4, 2020
99fdc86
Apply suggestions from code review
zadjii-msft May 4, 2020
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
14 changes: 10 additions & 4 deletions src/renderer/dx/CustomTextRenderer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,14 +263,20 @@ using namespace Microsoft::Console::Render;
RETURN_IF_FAILED(drawingContext->renderTarget->QueryInterface(d2dContext.GetAddressOf()));

// Draw the background
// The rectangle needs to be deduced based on the origin and the BidiDirection
const auto advancesSpan = gsl::make_span(glyphRun->glyphAdvances, glyphRun->glyphCount);
const auto totalSpan = std::accumulate(advancesSpan.cbegin(), advancesSpan.cend(), 0.0f);

D2D1_RECT_F rect;
rect.top = origin.y;
rect.bottom = rect.top + drawingContext->cellSize.height;
rect.left = origin.x;
rect.right = rect.left;
const auto advancesSpan = gsl::make_span(glyphRun->glyphAdvances, glyphRun->glyphCount);

rect.right = std::accumulate(advancesSpan.cbegin(), advancesSpan.cend(), rect.right);
// Check for RTL, if it is, move rect.left to the left from the baseline
if (WI_IsFlagSet(glyphRun->bidiLevel, 1))
{
rect.left -= totalSpan;
}
rect.right = rect.left + totalSpan;

// Clip all drawing in this glyph run to where we expect.
// We need the AntialiasMode here to be Aliased to ensure
Expand Down