Skip to content

armgit / zed

Public Imported from GitHub
0

Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.

gpui: Snap recomputed padding to the device pixel grid before clamping scroll (#62296)

Vlad Gaevskyb1a7ef0cf66d
diff --git a/crates/gpui/src/elements/div.rs b/crates/gpui/src/elements/div.rs
index 98275cd1893..8a6da212d6e 100644
--- a/crates/gpui/src/elements/div.rs
+++ b/crates/gpui/src/elements/div.rs
@@ -2346,7 +2346,14 @@ impl Interactivity {
}
let rem_size = window.rem_size();
- let padding = style.padding.to_pixels(bounds.size.into(), rem_size);
+ // Taffy lays the box out with the padding snapped to the device pixel
+ // grid (`to_taffy`); recomputed unsnapped, e.g. py_1 at a fractional
+ // rem size, it exceeds `bounds` and leaves the box scrollable by the
+ // sub-pixel difference.
+ let padding = style
+ .padding
+ .to_pixels(bounds.size.into(), rem_size)
+ .map(|edge| window.pixel_snap(*edge));
let padding_size = size(padding.left + padding.right, padding.top + padding.bottom);
// The floating point values produced by Taffy and ours often vary
// slightly after ~5 decimal places. This can lead to cases where after
@@ -5165,6 +5172,48 @@ mod tests {
assert_eq!(focused, Some(item_b.id));
}
+ #[gpui::test]
+ fn test_fractional_padding_does_not_make_a_fitting_container_scrollable(
+ cx: &mut TestAppContext,
+ ) {
+ struct PaddedContainer {
+ scroll_handle: ScrollHandle,
+ }
+
+ impl Render for PaddedContainer {
+ fn render(
+ &mut self,
+ _window: &mut Window,
+ _cx: &mut Context<Self>,
+ ) -> impl IntoElement {
+ // 4.25px of padding snaps to 4px in layout, so a 42px child
+ // fits the 50px box exactly.
+ div().size_full().child(
+ div()
+ .id("container")
+ .h(px(50.))
+ .w(px(100.))
+ .py(px(4.25))
+ .overflow_y_scroll()
+ .track_scroll(&self.scroll_handle)
+ .child(div().w_full().h(px(42.))),
+ )
+ }
+ }
+
+ let scroll_handle = ScrollHandle::new();
+ let window: AnyWindowHandle = cx
+ .add_window({
+ let scroll_handle = scroll_handle.clone();
+ move |_, _| PaddedContainer { scroll_handle }
+ })
+ .into();
+ cx.update_window(window, |_, window, cx| window.draw(cx).clear(cx))
+ .unwrap();
+
+ assert_eq!(scroll_handle.max_offset().y, px(0.));
+ }
+
struct ContentSizedGrid;
impl Render for ContentSizedGrid {