summaryrefslogtreecommitdiffstats
path: root/layout/base
diff options
context:
space:
mode:
authorMoonchild <mcwerewolf@gmail.com>2018-04-29 18:52:17 +0200
committerGitHub <noreply@github.com>2018-04-29 18:52:17 +0200
commit8c146ab24ac1b571d157db17a658cdc38c3a541d (patch)
tree55b4af8af161bdd67185974bab818c474eb7cab6 /layout/base
parentb83c51a1a51f58a7a68d1a4877b0f0a8f03a939e (diff)
parent1f4ce97ecd5fa47eead41e1408d2d26ce50749fa (diff)
downloadUXP-8c146ab24ac1b571d157db17a658cdc38c3a541d.tar
UXP-8c146ab24ac1b571d157db17a658cdc38c3a541d.tar.gz
UXP-8c146ab24ac1b571d157db17a658cdc38c3a541d.tar.lz
UXP-8c146ab24ac1b571d157db17a658cdc38c3a541d.tar.xz
UXP-8c146ab24ac1b571d157db17a658cdc38c3a541d.zip
Merge pull request #297 from janekptacijarabaci/css_text-justify_1
CSS - implement text-justify property
Diffstat (limited to 'layout/base')
-rw-r--r--layout/base/nsLayoutUtils.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/layout/base/nsLayoutUtils.cpp b/layout/base/nsLayoutUtils.cpp
index c8c91b251..86874f404 100644
--- a/layout/base/nsLayoutUtils.cpp
+++ b/layout/base/nsLayoutUtils.cpp
@@ -7013,7 +7013,8 @@ nsLayoutUtils::GetTextRunFlagsForStyle(nsStyleContext* aStyleContext,
nscoord aLetterSpacing)
{
uint32_t result = 0;
- if (aLetterSpacing != 0) {
+ if (aLetterSpacing != 0 ||
+ aStyleText->mTextJustify == StyleTextJustify::InterCharacter) {
result |= gfxTextRunFactory::TEXT_DISABLE_OPTIONAL_LIGATURES;
}
if (aStyleText->mControlCharacterVisibility == NS_STYLE_CONTROL_CHARACTER_VISIBILITY_HIDDEN) {