diff --git a/bin/unit_tests/assets/html/eepp-ui-anchor-margins.webp b/bin/unit_tests/assets/html/eepp-ui-anchor-margins.webp index f501815a6..8063ce940 100644 Binary files a/bin/unit_tests/assets/html/eepp-ui-anchor-margins.webp and b/bin/unit_tests/assets/html/eepp-ui-anchor-margins.webp differ diff --git a/bin/unit_tests/assets/html/eepp-ui-span-padding.webp b/bin/unit_tests/assets/html/eepp-ui-span-padding.webp index 2fcadba2b..23e1dd1fc 100644 Binary files a/bin/unit_tests/assets/html/eepp-ui-span-padding.webp and b/bin/unit_tests/assets/html/eepp-ui-span-padding.webp differ diff --git a/src/eepp/graphics/richtext.cpp b/src/eepp/graphics/richtext.cpp index f9698d303..a7b7fa348 100644 --- a/src/eepp/graphics/richtext.cpp +++ b/src/eepp/graphics/richtext.cpp @@ -551,9 +551,8 @@ void RichText::updateLayout() { Float ascent = fontStyle.Font->getAscent( fontStyle.CharacterSize ); Float height = - pText->lineHeight > 0 ? pText->lineHeight - : mLineHeight > 0 - ? mLineHeight + pText->lineHeight > 0 + ? pText->lineHeight : fontStyle.Font->getLineSpacing( fontStyle.CharacterSize ); Float spanWidth = renderSpanText->getTextWidth(); @@ -844,9 +843,8 @@ void RichText::updateLayout() { renderSpanText->setStyleConfig( fontStyle ); Float ascent = fontStyle.Font->getAscent( fontStyle.CharacterSize ); - Float height = pText->lineHeight > 0 ? pText->lineHeight - : mLineHeight > 0 - ? mLineHeight + Float height = pText->lineHeight > 0 + ? pText->lineHeight : fontStyle.Font->getLineSpacing( fontStyle.CharacterSize ); Float spanWidth = renderSpanText->getTextWidth(); diff --git a/src/tests/unit_tests/uihtml_tests.cpp b/src/tests/unit_tests/uihtml_tests.cpp index 3bd2a1fb4..981f8e0bd 100644 --- a/src/tests/unit_tests/uihtml_tests.cpp +++ b/src/tests/unit_tests/uihtml_tests.cpp @@ -170,6 +170,14 @@ UTEST( UIRichText, anchorMargins ) { SceneManager::instance()->draw(); win->display(); + auto anchors = sceneNode->getRoot()->findAllByTag( "a" ); + + for ( auto anchor : anchors ) { + auto a = anchor->asType(); + EXPECT_EQ( anchor->getPixelsSize().getHeight(), + a->getFont()->getLineSpacing( a->getFontSize() ) ); + } + compareImages( utest_state, utest_result, win, "eepp-ui-anchor-margins", "html" ); Engine::destroySingleton();