diff --git a/src/Plugins/MagnumFont/MagnumFont.cpp b/src/Plugins/MagnumFont/MagnumFont.cpp index 4094e6bc6..6ab867287 100644 --- a/src/Plugins/MagnumFont/MagnumFont.cpp +++ b/src/Plugins/MagnumFont/MagnumFont.cpp @@ -160,7 +160,7 @@ std::pair MagnumFont::openInternal(Utility::Configuration&& conf, _opened->glyphId.emplace(c->value("unicode"), glyphId); } - return {_opened->conf.value("fontSize"), 0}; + return {_opened->conf.value("fontSize"), _opened->conf.value("lineHeight")}; } void MagnumFont::doClose() { diff --git a/src/Plugins/MagnumFont/Test/MagnumFontTest.cpp b/src/Plugins/MagnumFont/Test/MagnumFontTest.cpp index b28676d9b..d22468073 100644 --- a/src/Plugins/MagnumFont/Test/MagnumFontTest.cpp +++ b/src/Plugins/MagnumFont/Test/MagnumFontTest.cpp @@ -51,6 +51,7 @@ void MagnumFontTest::properties() { MagnumFont font; CORRADE_VERIFY(font.openFile(Utility::Directory::join(MAGNUMFONT_TEST_DIR, "font.conf"), 0.0f)); CORRADE_COMPARE(font.size(), 16.0f); + CORRADE_COMPARE(font.lineHeight(), 39.7333f); CORRADE_COMPARE(font.glyphAdvance(font.glyphId(U'W')), Vector2(23.0f, 0.0f)); } diff --git a/src/Plugins/MagnumFont/Test/font.conf b/src/Plugins/MagnumFont/Test/font.conf index 4c2a3baea..7cf2c7b9b 100644 --- a/src/Plugins/MagnumFont/Test/font.conf +++ b/src/Plugins/MagnumFont/Test/font.conf @@ -3,6 +3,7 @@ image=font.tga originalImageSize=1536 1536 padding=24 24 fontSize=16 +lineHeight=39.7333 [char] unicode=57 glyph=2 diff --git a/src/Plugins/MagnumFontConverter/MagnumFontConverter.cpp b/src/Plugins/MagnumFontConverter/MagnumFontConverter.cpp index b7ac51cfc..4b5fce79c 100644 --- a/src/Plugins/MagnumFontConverter/MagnumFontConverter.cpp +++ b/src/Plugins/MagnumFontConverter/MagnumFontConverter.cpp @@ -57,6 +57,7 @@ std::vector>> MagnumFont configuration.setValue("originalImageSize", cache.textureSize()); configuration.setValue("padding", cache.padding()); configuration.setValue("fontSize", font.size()); + configuration.setValue("lineHeight", font.lineHeight()); /* Compress glyph IDs so the glyphs are in consecutive array, glyph 0 should stay at position 0 */ diff --git a/src/Plugins/MagnumFontConverter/Test/MagnumFontConverterTest.cpp b/src/Plugins/MagnumFontConverter/Test/MagnumFontConverterTest.cpp index 25e14c1d6..e0676f0e3 100644 --- a/src/Plugins/MagnumFontConverter/Test/MagnumFontConverterTest.cpp +++ b/src/Plugins/MagnumFontConverter/Test/MagnumFontConverterTest.cpp @@ -67,7 +67,7 @@ void MagnumFontConverterTest::exportFont() { bool doIsOpened() const { return _opened; } std::pair doOpenFile(const std::string&, Float) { _opened = true; - return {16.0f, 0}; + return {16.0f, 39.7333f}; } Features doFeatures() const { return {}; } std::unique_ptr doLayout(const GlyphCache&, Float, const std::string&) { return nullptr; }