summaryrefslogtreecommitdiff
path: root/test/text
diff options
context:
space:
mode:
authorAlexander Shalamov <alexander.shalamov@mapbox.com>2019-11-13 11:22:26 +0200
committerAlexander Shalamov <alexander.shalamov@mapbox.com>2019-12-02 17:11:49 +0200
commit34a9bc08ceefd695240047061fed41c591d30171 (patch)
tree71343b52067ea3dc1326b4637b03d78ab5c19969 /test/text
parenta9c3b5a389a249a9ddb62250cdcb8f8edb2f7280 (diff)
downloadqtlocation-mapboxgl-34a9bc08ceefd695240047061fed41c591d30171.tar.gz
[core] Pass images and evaluated layout text size to shaping
Diffstat (limited to 'test/text')
-rw-r--r--test/text/shaping.test.cpp10
1 files changed, 7 insertions, 3 deletions
diff --git a/test/text/shaping.test.cpp b/test/text/shaping.test.cpp
index b22cd7da36..c4d2ef7fc4 100644
--- a/test/text/shaping.test.cpp
+++ b/test/text/shaping.test.cpp
@@ -26,17 +26,21 @@ TEST(Shaping, ZWSP) {
{ FontStackHasher()(fontStack), {{u'中', std::move(immutableGlyph)}} }
};
- const auto testGetShaping = [&] (const TaggedString& string, unsigned maxWidthInChars) {
+ ImagePositions imagePositions;
+
+ const auto testGetShaping = [&](const TaggedString& string, unsigned maxWidthInChars) {
return getShaping(string,
maxWidthInChars * ONE_EM,
- ONE_EM, // lineHeight
+ ONE_EM, // lineHeight
style::SymbolAnchorType::Center,
style::TextJustifyType::Center,
- 0, // spacing
+ 0, // spacing
{{0.0f, 0.0f}}, // translate
WritingModeType::Horizontal,
bidi,
glyphs,
+ imagePositions,
+ 16.0,
/*allowVerticalPlacement*/ false);
};