From 3d8aa12c8febbf383c82feeb03e68efea1785b77 Mon Sep 17 00:00:00 2001 From: bflatastic Date: Sun, 22 Nov 2026 09:10:45 +0700 Subject: [PATCH] ui-contract: a scrolled body of a layer, or in one, starts at the top at every opening of the layer --- crates/ui-contract/src/contract/body/hooks.rs | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/crates/ui-contract/src/contract/body/hooks.rs b/crates/ui-contract/src/contract/body/hooks.rs index a1986db8c..adb4267ef 100644 --- a/crates/ui-contract/src/contract/body/hooks.rs +++ b/crates/ui-contract/src/contract/body/hooks.rs @@ -203,6 +203,14 @@ impl ShapeHooks for BodyHooks<'_> { self.strip = scroll_strip_height(&env.tokens); self.row = env.tokens.size.control.md; let Some(scroll) = scroll else { return }; + // A scrolled body of a layer, or in one, starts at the top at every opening of the layer, as at its first. + let opening = match props.mount { + Mount::Layer(_) => crate::runtime::overlay::appears(&ctx, id, false), + _ => crate::runtime::overlay::drawing_parent(&ctx).is_some_and(|layer| crate::runtime::overlay::opening(&ctx, layer)), + }; + if opening && comp.scroll().is_none() { + *stage.session::(sub(id, "scroll")) = ScrollState::default(); + } self.last_extent = stage.session::(sub(id, "scroll")).extent; self.scroll_bound = comp.scroll().is_some(); let held = match comp.scroll() {