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

layout: Take in account max inline size for inline fragments

Browse source
This commit is contained in:
Emilio Cobos Álvarez 2016-04-13 03:57:11 +02:00
parent 7e63c1be63
commit 8abefd7e5e
No known key found for this signature in database
GPG key ID: 056B727BB9C1027C
1 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
components/layout/fragment.rs
View file

@ -1030,8 +1030,13 @@ impl Fragment {
let flags = self.quantities_included_in_intrinsic_inline_size();
let style = self.style();
let specified = if flags.contains(INTRINSIC_INLINE_SIZE_INCLUDES_SPECIFIED) {
max(model::specified(style.min_inline_size(), Au(0)),
MaybeAuto::from_style(style.content_inline_size(), Au(0)).specified_or_zero())
let specified = MaybeAuto::from_style(style.content_inline_size(), Au(0)).specified_or_zero();
let min_or_specified = max(model::specified(style.min_inline_size(), Au(0)), specified);
if let Some(max) = model::specified_or_none(style.max_inline_size(), Au(0)) {
min(min_or_specified, max)
} else {
min_or_specified
}
} else {
Au(0)
};