diff options
author | wolfbeast <mcwerewolf@gmail.com> | 2018-02-13 19:26:43 +0100 |
---|---|---|
committer | wolfbeast <mcwerewolf@gmail.com> | 2018-02-13 19:26:43 +0100 |
commit | 1da0e8a095d82dd6b9ad0c0a45a7ee3b9d80ded7 (patch) | |
tree | 4925b88246f13f2fc6d1aec40fdaced5284237c7 /layout | |
parent | 2b6c1f971b486152cbf116452e5f723e2b2d068f (diff) | |
download | UXP-1da0e8a095d82dd6b9ad0c0a45a7ee3b9d80ded7.tar UXP-1da0e8a095d82dd6b9ad0c0a45a7ee3b9d80ded7.tar.gz UXP-1da0e8a095d82dd6b9ad0c0a45a7ee3b9d80ded7.tar.lz UXP-1da0e8a095d82dd6b9ad0c0a45a7ee3b9d80ded7.tar.xz UXP-1da0e8a095d82dd6b9ad0c0a45a7ee3b9d80ded7.zip |
Never shrink line heights as a result of minimumFontSize.
See: MoonchildProductions/Pale-Moon#1614.
Diffstat (limited to 'layout')
-rw-r--r-- | layout/style/nsRuleNode.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/layout/style/nsRuleNode.cpp b/layout/style/nsRuleNode.cpp index b22002d87..fa29fe0f1 100644 --- a/layout/style/nsRuleNode.cpp +++ b/layout/style/nsRuleNode.cpp @@ -4686,7 +4686,8 @@ nsRuleNode::ComputeTextData(void* aStartStruct, if (font->mSize != 0) { lh = nscoord(float(lh) * float(font->mFont.size) / float(font->mSize)); } else { - lh = minimumFontSize; + // Never shrink line heights as a result of minFontSize + lh = std::max(lh, minimumFontSize); } } text->mLineHeight.SetCoordValue(lh); |