visualModel->mCharactersToGlyph.Begin(),
visualModel->mGlyphsPerCharacter.Begin(),
totalNumberOfGlyphs,
- Layout::HORIZONTAL_ALIGN_BEGIN,
+ Text::HorizontalAlignment::BEGIN,
Layout::LineWrap::WORD );
layoutParameters.isLastNewParagraph = isLastNewParagraph;
visualModel->mCharactersToGlyph.Begin(),
visualModel->mGlyphsPerCharacter.Begin(),
visualModel->mGlyphs.Count(),
- Layout::HORIZONTAL_ALIGN_BEGIN,
+ Text::HorizontalAlignment::BEGIN,
Layout::LineWrap::WORD );
layoutParameters.numberOfBidirectionalInfoRuns = logicalModel->mBidirectionalLineInfo.Count();
struct AlignData
{
- std::string description;
- std::string text;
- Size textArea;
- unsigned int numberOfFonts;
- FontDescriptionRun* fontDescriptions;
- Layout::HorizontalAlignment horizontalAlignment;
- Layout::VerticalAlignment verticalAlignment;
- unsigned int startIndex;
- unsigned int numberOfCharacters;
- unsigned int numberOfLines;
- float* lineOffsets;
+ std::string description;
+ std::string text;
+ Size textArea;
+ unsigned int numberOfFonts;
+ FontDescriptionRun* fontDescriptions;
+ Text::HorizontalAlignment::Type horizontalAlignment;
+ Text::VerticalAlignment::Type verticalAlignment;
+ unsigned int startIndex;
+ unsigned int numberOfCharacters;
+ unsigned int numberOfLines;
+ float* lineOffsets;
};
bool AlignTest( const AlignData& data )
textArea,
6u,
fontDescriptionRuns.Begin(),
- Layout::HORIZONTAL_ALIGN_BEGIN,
- Layout::VERTICAL_ALIGN_TOP,
+ Text::HorizontalAlignment::BEGIN,
+ Text::VerticalAlignment::TOP,
0u,
22u,
6u,
textArea,
6u,
fontDescriptionRuns.Begin(),
- Layout::HORIZONTAL_ALIGN_BEGIN,
- Layout::VERTICAL_ALIGN_TOP,
+ Text::HorizontalAlignment::BEGIN,
+ Text::VerticalAlignment::TOP,
22u,
26u,
6u,
textArea,
6u,
fontDescriptionRuns.Begin(),
- Layout::HORIZONTAL_ALIGN_BEGIN,
- Layout::VERTICAL_ALIGN_TOP,
+ Text::HorizontalAlignment::BEGIN,
+ Text::VerticalAlignment::TOP,
48u,
26u,
6u,
textArea,
6u,
fontDescriptionRuns.Begin(),
- Layout::HORIZONTAL_ALIGN_CENTER,
- Layout::VERTICAL_ALIGN_TOP,
+ Text::HorizontalAlignment::CENTER,
+ Text::VerticalAlignment::TOP,
0u,
22u,
6u,
textArea,
6u,
fontDescriptionRuns.Begin(),
- Layout::HORIZONTAL_ALIGN_CENTER,
- Layout::VERTICAL_ALIGN_TOP,
+ Text::HorizontalAlignment::CENTER,
+ Text::VerticalAlignment::TOP,
22u,
26u,
6u,
textArea,
6u,
fontDescriptionRuns.Begin(),
- Layout::HORIZONTAL_ALIGN_CENTER,
- Layout::VERTICAL_ALIGN_TOP,
+ Text::HorizontalAlignment::CENTER,
+ Text::VerticalAlignment::TOP,
48u,
26u,
6u,
textArea,
6u,
fontDescriptionRuns.Begin(),
- Layout::HORIZONTAL_ALIGN_END,
- Layout::VERTICAL_ALIGN_TOP,
+ Text::HorizontalAlignment::END,
+ Text::VerticalAlignment::TOP,
0u,
22u,
6u,
textArea,
6u,
fontDescriptionRuns.Begin(),
- Layout::HORIZONTAL_ALIGN_END,
- Layout::VERTICAL_ALIGN_TOP,
+ Text::HorizontalAlignment::END,
+ Text::VerticalAlignment::TOP,
22u,
26u,
6u,
textArea,
6u,
fontDescriptionRuns.Begin(),
- Layout::HORIZONTAL_ALIGN_END,
- Layout::VERTICAL_ALIGN_TOP,
+ Text::HorizontalAlignment::END,
+ Text::VerticalAlignment::TOP,
48u,
26u,
6u,