mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-12-28 11:29:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

WIP

Browse source
This commit is contained in:
Nathan Sobo 2023-07-28 15:29:29 -06:00
parent 4d66c3237d
commit 6d10328796
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
crates/gpui/playground/ui/src/node.rs
View file

@ -355,8 +355,8 @@ impl<V: View> Node<V> {
dbg!(self.id_as_string()); dbg!(self.id_as_string());
for axis in [Axis2d::X, Axis2d::Y] { for axis in [Axis2d::X, Axis2d::Y] {
dbg!(axis);
let length = self.style.size.get(axis); let length = self.style.size.get(axis);
dbg!(axis, length);
match length { match length {
Length::Fixed(fixed_length) => { Length::Fixed(fixed_length) => {
@ -364,7 +364,8 @@ impl<V: View> Node<V> {
// before laying out the children. // before laying out the children.
let fixed_length = fixed_length.to_pixels(rem_pixels); let fixed_length = fixed_length.to_pixels(rem_pixels);
let mut remaining_flex = total_flex.get(axis); let mut remaining_flex = total_flex.get(axis);
let mut remaining_length = padded_constraint.max.get(axis) - fixed_length; let mut remaining_length =
(padded_constraint.max.get(axis) - fixed_length).max(0.);
// Here we avoid the padding exceeding the fixed length by giving // Here we avoid the padding exceeding the fixed length by giving
// the padding calculation its own remaining_flex and remaining_length. // the padding calculation its own remaining_flex and remaining_length.
@ -379,7 +380,7 @@ impl<V: View> Node<V> {
rem_pixels, rem_pixels,
); );
remaining_flex -= padding_flex; remaining_flex -= padding_flex;
remaining_length -= padding_flex; remaining_length -= padding_length;
layout.margins.compute_flex_edges( layout.margins.compute_flex_edges(
&self.style.margins, &self.style.margins,
axis, axis,
@ -388,6 +389,8 @@ impl<V: View> Node<V> {
rem_pixels, rem_pixels,
); );
dbg!(remaining_flex, remaining_length);
child_constraint.max.set(axis, remaining_length); child_constraint.max.set(axis, remaining_length);
if axis == cross_axis { if axis == cross_axis {
child_constraint.min.set(axis, remaining_length); child_constraint.min.set(axis, remaining_length);