mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-15 00:24:19 +00:00
Code Activity

DirectWrite RTL layout fix.

Browse source
This commit is contained in:
jules 2012-06-08 15:29:58 +01:00
parent 8810c804e4
commit 0e6bbcc55c
1 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

15
modules/juce_graphics/native/juce_win32_DirectWriteTypeLayout.cpp
View file

@ -198,13 +198,22 @@ namespace DirectWriteTypeLayout
default: jassertfalse; break; // Illegal flags!
}
format->SetTextAlignment (alignment);
format->SetWordWrapping (wrapType);
// DirectWrite does not automatically set reading direction
// This must be set correctly and manually when using RTL Scripts (Hebrew, Arabic)
if (text.getReadingDirection() == AttributedString::rightToLeft)
{
format->SetReadingDirection (DWRITE_READING_DIRECTION_RIGHT_TO_LEFT);
switch (text.getJustification().getOnlyHorizontalFlags())
{
case Justification::left: alignment = DWRITE_TEXT_ALIGNMENT_TRAILING; break;
case Justification::right: alignment = DWRITE_TEXT_ALIGNMENT_LEADING; break;
default: break;
}
}
format->SetTextAlignment (alignment);
format->SetWordWrapping (wrapType);
}
void addAttributedRange (const AttributedString::Attribute& attr, IDWriteTextLayout* textLayout,