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

Fixed DirectX RTL text issue where it'd be over other text / offscreen #1873

Merged
merged 8 commits into from
Jul 10, 2019
Merged

Fixed DirectX RTL text issue where it'd be over other text / offscreen #1873

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5cb148c
Fixed DirectX RTL text issue where it would appear to left, potential…
schorrm Jul 8, 2019
3535bc3
checking the formatting
schorrm Jul 8, 2019
c002178
Revert "checking the formatting"
schorrm Jul 9, 2019
6ce474a
Fixed commenting, added curly brackets
schorrm Jul 10, 2019
f1befdb
Make postOriginX const
schorrm Jul 10, 2019
19b9af5
Realigned spacing on postOriginX accumulate call
schorrm Jul 10, 2019
fb49f4d
Merge branch 'master' of https://github.com/schorrm/terminal
schorrm Jul 10, 2019
919b8b0
Clang-Formatted
schorrm Jul 10, 2019
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
16 changes: 12 additions & 4 deletions src/renderer/dx/CustomTextLayout.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -498,6 +498,16 @@ CustomTextLayout::CustomTextLayout(IDWriteFactory2* const factory,
glyphRunDescription.stringLength = run.textLength;
glyphRunDescription.textPosition = run.textStart;

// Calculate the position *after* drawing, this will be used if we're in RTL.
miniksa marked this conversation as resolved.
Show resolved Hide resolved
// Original comment:
miniksa marked this conversation as resolved.
Show resolved Hide resolved
// Shift origin to the right for the next run based on the amount of space consumed.
auto postOriginX = std::accumulate(_glyphAdvances.begin() + run.glyphStart,
schorrm marked this conversation as resolved.
Show resolved Hide resolved
_glyphAdvances.begin() + run.glyphStart + run.glyphCount,
mutableOrigin.x);

if (WI_IsFlagSet(glyphRun.bidiLevel, 1))
miniksa marked this conversation as resolved.
Show resolved Hide resolved
mutableOrigin.x = postOriginX;

// Try to draw it
RETURN_IF_FAILED(renderer->DrawGlyphRun(clientDrawingContext,
mutableOrigin.x,
Expand All @@ -507,10 +517,8 @@ CustomTextLayout::CustomTextLayout(IDWriteFactory2* const factory,
&glyphRunDescription,
nullptr));

// Shift origin to the right for the next run based on the amount of space consumed.
mutableOrigin.x = std::accumulate(_glyphAdvances.begin() + run.glyphStart,
_glyphAdvances.begin() + run.glyphStart + run.glyphCount,
mutableOrigin.x);
mutableOrigin.x = postOriginX;

}
}
CATCH_RETURN();
Expand Down