Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-09-30 00:29:14 +01:00
Code Issues Projects Releases Packages Wiki Activity

layout: Simplify effective_overflow() a little (#39172)

Browse source 
This implements the Default trait for `AxesOverflow`, to avoid having to
manually set both axes to `Overflow::Visible`.

Also implements the conversion from `&ComputedValues` to `AxesOverflow`,
which is the also used for overflow viewport propagation.

And moves the `is_inline_box()` checkinto the `ignores_overflow` logic.

Testing: Not needed, no change in behavior

Signed-off-by: Oriol Brufau <obrufau@igalia.com>
This commit is contained in:
Oriol Brufau 2025-09-06 11:10:15 +02:00 • committed by GitHub
parent c490033c52
commit 506e186d03
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 55 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

16
components/layout/flow/root.rs
View file

@ -31,7 +31,7 @@ use crate::fragment_tree::{FragmentFlags, FragmentTree};
use crate::geom::{LogicalVec2, PhysicalSize};
use crate::positioned::{AbsolutelyPositionedBox, PositioningContext};
use crate::replaced::ReplacedContents;
use crate::style_ext::{Display, DisplayGeneratingBox, DisplayInside};
use crate::style_ext::{AxesOverflow, Display, DisplayGeneratingBox, DisplayInside};
use crate::taffy::{TaffyItemBox, TaffyItemBoxInner};
use crate::{DefiniteContainingBlock, PropagatedBoxTreeData};
@ -60,11 +60,10 @@ impl BoxTree {
// > used overflow value of visible.
let root_style = root_element.style(&context.style_context);
let mut viewport_overflow_x = root_style.clone_overflow_x();
let mut viewport_overflow_y = root_style.clone_overflow_y();
let mut viewport_overflow = AxesOverflow::from(&*root_style);
let mut element_propagating_overflow = root_element;
if viewport_overflow_x == Overflow::Visible &&
viewport_overflow_y == Overflow::Visible &&
if viewport_overflow.x == Overflow::Visible &&
viewport_overflow.y == Overflow::Visible &&
!root_style.get_box().display.is_none()
{
for child in root_element.children() {
@ -77,8 +76,7 @@ impl BoxTree {
let style = child.style(&context.style_context);
if !style.get_box().display.is_none() {
viewport_overflow_x = style.clone_overflow_x();
viewport_overflow_y = style.clone_overflow_y();
viewport_overflow = AxesOverflow::from(&*style);
element_propagating_overflow = child;
break;
@ -112,8 +110,8 @@ impl BoxTree {
// > If visible is applied to the viewport, it must be interpreted as auto.
// > If clip is applied to the viewport, it must be interpreted as hidden.
viewport_scroll_sensitivity: AxesScrollSensitivity {
x: viewport_overflow_x.to_scrollable().into(),
y: viewport_overflow_y.to_scrollable().into(),
x: viewport_overflow.x.to_scrollable().into(),
y: viewport_overflow.y.to_scrollable().into(),
},
}
}