Skip to content

Fix text align #413

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rodarima merged 2 commits into from
Jul 7, 2025
Merged

Fix text align #413

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e3cedc5
Expand text-align-center test with more test cases
campaul Jun 17, 2025
5012112
Fix text-align
campaul Jun 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 17 additions & 1 deletion dw/textblock_linebreaking.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1804,7 +1804,23 @@ void Textblock::alignLine (int lineIndex)
int lineBreakWidth =
this->lineBreakWidth - (line->leftOffset + line->rightOffset);

switch (firstWord->style->textAlign) {
core::style::TextAlignType alignStyle = core::style::TEXT_ALIGN_LEFT;

/**
* Only inline elements should be affected by the text-align property.
* While alignStyle will still apply to other elements, the default
* value of TEXT_ALIGN_LEFT will have no effect on the alignment.
*/
if (firstWord->style->display == core::style::DISPLAY_INLINE ||
firstWord->style->display == core::style::DISPLAY_INLINE_BLOCK) {
/**
* Elements that *are* affected by text-align are aligned based on
* the text-align value of their containing element.
*/
alignStyle = getStyle()->textAlign;
}

switch (alignStyle) {
case core::style::TEXT_ALIGN_LEFT:
DBG_OBJ_MSG ("construct.line", 1,
"first word has 'text-align: left'");
Expand Down
3 changes: 1 addition & 2 deletions test/html/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,5 +59,4 @@ XFAIL_TESTS = \
render/min-width-html.html \
render/multiple-floats.html \
render/span-padding.html \
render/table-td-width-percent.html \
render/text-align-center.html
render/table-td-width-percent.html
62 changes: 58 additions & 4 deletions test/html/render/text-align-center.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,73 @@
<head>
<title>Test text-align: center</title>
<style>
.outer {
.center {
background-color:aquamarine;
text-align: center;
width: 400px;
}

.outer1 {
background-color:coral;
width: 400px;
}
.inner {
.inner1 {
background-color:aquamarine;
text-align: center;
width: 100px;
}

.outer2 {
background-color:coral;
text-align: center;
width: 400px;
}
.inner2 {
background-color:aquamarine;
width: 100px;
}

.outer3 {
background-color:coral;
width: 400px;
}
.inner3 {
background-color:aquamarine;
text-align: center;
width: 100px;
}

.outer4 {
background-color:coral;
text-align: center;
width: 400px;
}
.inner4 {
background-color:aquamarine;
width: 100px;
}

body > div {
margin-bottom: 10px;
}
</style>
</head>
<body>
<div class="outer">
<div class="inner">center</div>
<div class="center">simple centered text</div>

<div class="outer1">
<div class="inner1">nested div with internal center</div>
</div>

<div class="outer2">
<div class="inner2">nested div with external center</div>
</div>

<div class="outer3">
<span class="inner3">nested span with internal center</span>
</div>

<div class="outer4">
<span class="inner4">nested span with external center</span>
</div>
</html>
58 changes: 54 additions & 4 deletions test/html/render/text-align-center.ref.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,70 @@
margin: 0;
padding: 0;
}
.outer {
table {
margin-bottom: 10px;
}

.center {
background-color: aquamarine;
width: 400px;
}
.center td {
text-align: center;
}

.outer1 {
background-color:coral;
width: 400px;
}
.inner1 {
background-color:aquamarine;
text-align: center;
width: 100px;
}

.outer3 {
background-color:coral;
width: 400px;
}
.inner {
.inner3 {
background-color:aquamarine;
text-align: center;
width: 100px;
white-space: nowrap;
}

.outer4 {
background-color:coral;
width: 400px;
}
.inner4 {
background-color:aquamarine;
text-align: center;
width: 100px;
white-space: nowrap;
}
</style>
</head>
<body>
<table class="outer">
<tr><td class="inner">center</td><td></td></tr>
<table class="center">
<tr><td>simple centered text</td><td></td></tr>
</table>

<table class="outer1">
<tr><td class="inner1">nested div with internal center</td><td></td></tr>
</table>

<table class="outer1">
<tr><td class="inner1">nested div with external center</td><td></td></tr>
</table>

<table class="outer3">
<tr><td class="inner3">nested span with internal center</td><td></td></tr>
</table>

<table class="outer4">
<tr><td></td><td class="inner4">nested span with external center</td><td></td></tr>
</table>
</body>
</html>
Loading