mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-01-24 02:46:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 12

Upgrade Taffy version

Browse source 
Switch to using taffy content size calculation in div
Fix a bug where scrolling would not show the bottom padding

co-authored-by: antonio <antonio@zed.dev>
co-authored-by: conrad <conrad@zed.dev>
This commit is contained in:
Mikayla 2024-01-19 14:17:41 -08:00
parent ed7601e664
commit 7ad6bbfd56
No known key found for this signature in database
7 changed files with 52 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
crates/gpui/src/element.rs
View file

@ -1,6 +1,6 @@
use crate::{
outline, util::FluentBuilder, ArenaBox, AvailableSpace, BorrowWindow, Bounds, ElementId,
LayoutId, Pixels, Point, Size, ViewContext, WindowContext, ELEMENT_ARENA,
util::FluentBuilder, ArenaBox, AvailableSpace, BorrowWindow, Bounds, ElementId, LayoutId,
Pixels, Point, Size, ViewContext, WindowContext, ELEMENT_ARENA,
};
use derive_more::{Deref, DerefMut};
pub(crate) use smallvec::SmallVec;
@ -236,7 +236,6 @@ impl<E: Element> DrawableElement<E> {
}
fn paint(mut self, cx: &mut WindowContext) -> Option<E::State> {
let element_id = self.element_id();
match self.phase {
ElementDrawPhase::LayoutRequested {
layout_id,
@ -249,12 +248,6 @@ impl<E: Element> DrawableElement<E> {
} => {
let bounds = cx.layout_bounds(layout_id);
if element_id == Some(ElementId::Name("info_popover".into()))
|| element_id == Some(ElementId::Name("content".into()))
{
cx.paint_quad(outline(dbg!(bounds), crate::red()))
}
if let Some(mut frame_state) = frame_state {
self.element
.take()
@ -270,6 +263,7 @@ impl<E: Element> DrawableElement<E> {
.expect("if we don't have frame state, we should have element state");
cx.with_element_state(element_id, |element_state, cx| {
let mut element_state = element_state.unwrap();
self.element
.take()
.unwrap()

77
crates/gpui/src/elements/div.rs
View file

@ -1,5 +1,5 @@
use crate::{
outline, point, px, Action, AnyDrag, AnyElement, AnyTooltip, AnyView, AppContext,
point, px, size, Action, AnyDrag, AnyElement, AnyTooltip, AnyView, AppContext,
BorrowAppContext, BorrowWindow, Bounds, ClickEvent, DispatchPhase, Element, ElementId,
FocusHandle, IntoElement, IsZero, KeyContext, KeyDownEvent, KeyUpEvent, LayoutId, MouseButton,
MouseDownEvent, MouseMoveEvent, MouseUpEvent, ParentElement, Pixels, Point, Render,
@ -815,11 +815,7 @@ impl Element for Div {
element_state: &mut Self::State,
cx: &mut WindowContext,
) {
let mut child_min = point(Pixels::MAX, Pixels::MAX);
let mut child_max = Point::default();
let content_size = if element_state.child_layout_ids.is_empty() {
bounds.size
} else if let Some(scroll_handle) = self.interactivity.scroll_handle.as_ref() {
if let Some(scroll_handle) = self.interactivity.scroll_handle.as_ref() {
let mut state = scroll_handle.0.borrow_mut();
state.child_bounds = Vec::with_capacity(element_state.child_layout_ids.len());
state.bounds = bounds;
@ -827,8 +823,6 @@ impl Element for Div {
for (ix, child_layout_id) in element_state.child_layout_ids.iter().enumerate() {
let child_bounds = cx.layout_bounds(*child_layout_id);
child_min = child_min.min(&child_bounds.origin);
child_max = child_max.max(&child_bounds.lower_right());
state.child_bounds.push(child_bounds);
if let Some(requested) = requested.as_ref() {
@ -838,31 +832,16 @@ impl Element for Div {
}
}
}
(child_max - child_min).into()
} else {
if self.element_id() == Some(ElementId::Name("info_popover".into())) {
eprintln!("********************************************");
dbg!(&self.interactivity().base_style.padding);
dbg!(bounds);
dbg!(cx.layout_content_size(element_state.layout_id));
dbg!(cx.layout_scroll_size(element_state.layout_id));
}
}
cx.layout_content_size(element_state.layout_id)
};
let content_size = cx.layout_content_size(element_state.layout_id);
let element_id = self.element_id();
self.interactivity.paint(
bounds,
content_size,
&mut element_state.interactive_state,
Some(element_state.layout_id),
cx,
|_style, scroll_offset, cx| {
if element_id == Some(ElementId::Name("info_popover".into())) {
dbg!(scroll_offset);
};
cx.with_element_offset(scroll_offset, |cx| {
for child in &mut self.children {
child.paint(cx);
@ -1000,7 +979,6 @@ impl Interactivity {
bounds: Bounds<Pixels>,
content_size: Size<Pixels>,
element_state: &mut InteractiveElementState,
this_id: Option<LayoutId>,
cx: &mut WindowContext,
f: impl FnOnce(&Style, Point<Pixels>, &mut WindowContext),
) {
@ -1518,28 +1496,31 @@ impl Interactivity {
.clone();
let line_height = cx.line_height();
let mut scroll_max = this_id
.map(|id| cx.layout_scroll_size(id))
.unwrap_or(content_size - bounds.size)
.max(&Size::default());
if self.element_id == Some(ElementId::Name("info_popover".into())) {
dbg!(this_id);
dbg!(scroll_max);
//will this fix things?
// scroll_max = scroll_size + offset_position of child????
// scroll_max.height += dbg!(self
// .base_style
// .padding
// .bottom
// .map(|padding| {
// dbg!(padding)
// .to_pixels(content_size.height.into(), cx.rem_size())
// })
// .unwrap_or(px(0.)))
}
// TODO: Change this to be cx.layout_scroll_size() + bottom and right padding
// once we can access the layout ID easily from all elements
let scroll_max = (content_size - bounds.size
// Add the bottom padding to the scroll max, so that
// the bottom padding is visible but not clipping
// the scrollable area
+ size(
self.base_style
.padding
.right
.map(|padding| {
padding
.to_pixels(bounds.size.width.into(), cx.rem_size())
})
.unwrap_or(px(0.)),
self.base_style
.padding
.bottom
.map(|padding| {
padding
.to_pixels(bounds.size.height.into(), cx.rem_size())
})
.unwrap_or(px(0.)),
))
.max(&Size::default());
// Clamp scroll offset in case scroll max is smaller now (e.g., if children
// were removed or the bounds became larger).

1
crates/gpui/src/elements/img.rs
View file

@ -91,7 +91,6 @@ impl Element for Img {
bounds,
bounds.size,
element_state,
None,
cx,
|style, _scroll_offset, cx| {
let corner_radii = style.corner_radii.to_pixels(bounds.size, cx.rem_size());

15
crates/gpui/src/elements/svg.rs
View file

@ -1,8 +1,9 @@
use util::ResultExt;
use crate::{
Bounds, Element, ElementId, InteractiveElement, InteractiveElementState, Interactivity,
IntoElement, LayoutId, Pixels, SharedString, StyleRefinement, Styled, WindowContext,
};
use util::ResultExt;
pub struct Svg {
interactivity: Interactivity,
@ -44,18 +45,12 @@ impl Element for Svg {
) where
Self: Sized,
{
self.interactivity.paint(
bounds,
bounds.size,
element_state,
None,
cx,
|style, _, cx| {
self.interactivity
.paint(bounds, bounds.size, element_state, cx, |style, _, cx| {
if let Some((path, color)) = self.path.as_ref().zip(style.text.color) {
cx.paint_svg(bounds, path.clone(), color).log_err();
}
},
)
})
}
}

1
crates/gpui/src/elements/uniform_list.rs
View file

@ -182,7 +182,6 @@ impl Element for UniformList {
bounds,
content_size,
&mut element_state.interactive,
None,
cx,
|style, mut scroll_offset, cx| {
let border = style.border_widths.to_pixels(cx.rem_size());

14
crates/gpui/src/geometry.rs
View file

@ -497,6 +497,20 @@ where
}
}
impl<T> Add for Size<T>
where
T: Add<Output = T> + Clone + Default + Debug,
{
type Output = Size<T>;
fn add(self, rhs: Self) -> Self::Output {
Size {
width: self.width + rhs.width,
height: self.height + rhs.height,
}
}
}
impl<T, Rhs> Mul<Rhs> for Size<T>
where
T: Mul<Rhs, Output = Rhs> + Clone + Default + Debug,

2
crates/terminal_view/src/terminal_element.rs
View file

@ -755,7 +755,7 @@ impl Element for TerminalElement {
self.register_mouse_listeners(origin, layout.mode, bounds, cx);
self.interactivity
.paint(bounds, bounds.size, state, None, cx, |_, _, cx| {
.paint(bounds, bounds.size, state, cx, |_, _, cx| {
cx.handle_input(&self.focus, terminal_input_handler);
cx.on_key_event({