From 071412ab291a9f6181780dd0e5e2316c4a292a7c Mon Sep 17 00:00:00 2001 From: Moonchild Date: Sun, 24 Jul 2022 12:31:32 +0000 Subject: Issue #1970 - Part 7: Restore proper spacing in select for CJK/asian The issue is that select elements may contain some non-Latin characters that need extra block-size to display than the one line-height calculated by using a Latin font spec in the style. Before this patch, when a control has an unconstrained block-size, we set the element's block-size to one line-height in Reflow(), which is intended to properly initialize `BlockReflowInput::mMinLineHeight` since it uses `line-height:-moz-block-height`. However, this simply prevents the display from choosing a larger block-size after the reflow occurs. Previously, this discrepancy was absorbed by the extra padding present to make select elements the same intrinsic size as buttons, but since we did away with that, we're losing the extra space and the font glyphs get clipped. This patch fixes the issue by carrying the computed line height over to the element's display so that its computed block-size is still unconstrained. This way it can accommodate taller characters in the display text. After this patch, a + + + + + + + + \ No newline at end of file diff --git a/layout/generic/ReflowInput.cpp b/layout/generic/ReflowInput.cpp index f308ebcdf5..01f36cc9db 100644 --- a/layout/generic/ReflowInput.cpp +++ b/layout/generic/ReflowInput.cpp @@ -2813,6 +2813,17 @@ nscoord ReflowInput::GetLineHeight() const { nsLayoutUtils::FontSizeInflationFor(mFrame)); } +void ReflowInput::SetLineHeight(nscoord aLineHeight) { + MOZ_ASSERT(aLineHeight >= 0, "aLineHeight must be >= 0!"); + + if (mLineHeight != aLineHeight) { + mLineHeight = aLineHeight; + // Setting used line height can change a frame's block-size if mFrame's + // block-size behaves as auto. + InitResizeFlags(mFrame->PresContext(), mFrame->GetType()); + } +} + /* static */ nscoord ReflowInput::CalcLineHeight(nsIContent* aContent, nsStyleContext* aStyleContext, diff --git a/layout/generic/ReflowInput.h b/layout/generic/ReflowInput.h index d8e0518399..a70549d8eb 100644 --- a/layout/generic/ReflowInput.h +++ b/layout/generic/ReflowInput.h @@ -747,6 +747,11 @@ public: * Get the used line-height property. The return value will be >= 0. */ nscoord GetLineHeight() const; + + /** + * Set the used line-height. aLineHeight must be >= 0. + */ + void SetLineHeight(nscoord aLineHeight); /** * Calculate the used line-height property without a reflow input instance. -- cgit v1.2.3