Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-11 16:35:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

Use app units in replaced elements (#30825)

Browse source 
* use app_units in replaced elements

* fmt

* remove from_f32_px

* fix typo
This commit is contained in:
atbrakhi 2023-12-11 12:30:37 +01:00 • committed by GitHub
parent 589f291523
commit a315bec4ed
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

13
components/layout_2020/display_list/background.rs
View file

@ -2,6 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */
use app_units::Au;
use euclid::{Size2D, Vector2D};
use style::computed_values::background_clip::single_value::T as Clip;
use style::computed_values::background_origin::single_value::T as Origin;
@ -130,8 +131,8 @@ pub(super) fn layout_layer(
if width.is_none() && height.is_none() {
// Both computed values are 'auto':
// use intrinsic sizes, treating missing width or height as 'auto'
width = intrinsic.width;
height = intrinsic.height;
width = intrinsic.width.map(|v| v.into());
height = intrinsic.height.map(|v| v.into());
}
match (width, height) {
@ -140,10 +141,10 @@ pub(super) fn layout_layer(
let h = if let Some(intrinsic_ratio) = intrinsic.ratio {
w / intrinsic_ratio
} else if let Some(intrinsic_height) = intrinsic.height {
intrinsic_height
intrinsic_height.into()
} else {
// Treated as 100%
Length::new(positioning_area.size.height)
Au::from_f32_px(positioning_area.size.height).into()
};
units::LayoutSize::new(w.px(), h.px())
},
@ -151,10 +152,10 @@ pub(super) fn layout_layer(
let w = if let Some(intrinsic_ratio) = intrinsic.ratio {
h * intrinsic_ratio
} else if let Some(intrinsic_width) = intrinsic.width {
intrinsic_width
intrinsic_width.into()
} else {
// Treated as 100%
Length::new(positioning_area.size.width)
Au::from_f32_px(positioning_area.size.width).into()
};
units::LayoutSize::new(w.px(), h.px())
},