mirror of
https://github.com/servo/servo.git
synced 2025-08-06 14:10:11 +01:00
Auto merge of #11798 - notriddle:input_caret, r=nox
Account for the font of empty input fields The font of empty fragments is not accounted for in layout. This behavior is incorrect when part of an input field. - [X] `./mach build -d` does not report any errors - [X] `./mach test-tidy` does not report any errors - [X] These changes fix #11653 - [X] There are tests for these changes <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/11798) <!-- Reviewable:end -->
This commit is contained in:
commit
881c02ec89
4 changed files with 38 additions and 3 deletions
|
@ -1972,16 +1972,16 @@ impl Fragment {
|
|||
ascent: computed_block_size + self.border_padding.block_start,
|
||||
}
|
||||
}
|
||||
SpecificFragmentInfo::ScannedText(ref text_fragment) => {
|
||||
SpecificFragmentInfo::ScannedText(ref info) => {
|
||||
// Fragments with no glyphs don't contribute any inline metrics.
|
||||
// TODO: Filter out these fragments during flow construction?
|
||||
if text_fragment.content_size.inline == Au(0) {
|
||||
if info.insertion_point.is_none() && info.content_size.inline == Au(0) {
|
||||
return InlineMetrics::new(Au(0), Au(0), Au(0));
|
||||
}
|
||||
// See CSS 2.1 § 10.8.1.
|
||||
let line_height = self.calculate_line_height(layout_context);
|
||||
let font_derived_metrics =
|
||||
InlineMetrics::from_font_metrics(&text_fragment.run.font_metrics, line_height);
|
||||
InlineMetrics::from_font_metrics(&info.run.font_metrics, line_height);
|
||||
InlineMetrics {
|
||||
block_size_above_baseline: font_derived_metrics.block_size_above_baseline +
|
||||
self.border_padding.block_start,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue