mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-01-25 19:29:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Ensure flex_float works even when re-painting without layout

Browse source 
Previously, we were mutating the remaining space stored on the layout
state, which would cause re-paints to always have a `remaining_space`
of 0 and therefore not align `flex_float` elements to the right/bottom.
This commit is contained in:
Antonio Scandurra 2022-05-06 10:20:03 +02:00
parent 8445eaab85
commit 95d848fe1e
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
crates/gpui/src/elements/flex.rs
View file

@ -225,7 +225,9 @@ impl Element for Flex {
remaining_space: &mut Self::LayoutState, remaining_space: &mut Self::LayoutState,
cx: &mut PaintContext, cx: &mut PaintContext,
) -> Self::PaintState { ) -> Self::PaintState {
let overflowing = *remaining_space < 0.; let mut remaining_space = *remaining_space;
let overflowing = remaining_space < 0.;
if overflowing { if overflowing {
cx.scene.push_layer(Some(bounds)); cx.scene.push_layer(Some(bounds));
} }
@ -240,14 +242,14 @@ impl Element for Flex {
} }
for child in &mut self.children { for child in &mut self.children {
if *remaining_space > 0. { if remaining_space > 0. {
if let Some(metadata) = child.metadata::<FlexParentData>() { if let Some(metadata) = child.metadata::<FlexParentData>() {
if metadata.float { if metadata.float {
match self.axis { match self.axis {
Axis::Horizontal => child_origin += vec2f(*remaining_space, 0.0), Axis::Horizontal => child_origin += vec2f(remaining_space, 0.0),
Axis::Vertical => child_origin += vec2f(0.0, *remaining_space), Axis::Vertical => child_origin += vec2f(0.0, remaining_space),
} }
*remaining_space = 0.; remaining_space = 0.;
} }
} }
} }
@ -257,6 +259,7 @@ impl Element for Flex {
Axis::Vertical => child_origin += vec2f(0.0, child.size().y()), Axis::Vertical => child_origin += vec2f(0.0, child.size().y()),
} }
} }
if overflowing { if overflowing {
cx.scene.pop_layer(); cx.scene.pop_layer();
} }