From 232ddee30e2b8185b874f0a4c8f0018f2bba8156 Mon Sep 17 00:00:00 2001 From: rustbasic <127506429+rustbasic@users.noreply.github.com> Date: Sat, 14 Sep 2024 17:31:45 +0900 Subject: [PATCH] Update scroll_area.rs --- crates/egui/src/containers/scroll_area.rs | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/crates/egui/src/containers/scroll_area.rs b/crates/egui/src/containers/scroll_area.rs index ab7da8aff29..9301a6abe55 100644 --- a/crates/egui/src/containers/scroll_area.rs +++ b/crates/egui/src/containers/scroll_area.rs @@ -817,15 +817,7 @@ impl Prepared { let content_size = content_ui.min_size(); - let scroll_delta = content_ui - .ctx() - .pass_state_mut(|state| std::mem::take(&mut state.scroll_delta)); - for d in 0..2 { - // PassState::scroll_delta is inverted from the way we apply the delta, so we need to negate it. - let mut delta = -scroll_delta.0[d]; - let mut animation = scroll_delta.1; - // We always take both scroll targets regardless of which scroll axes are enabled. This // is to avoid them leaking to other scroll areas. let scroll_target = content_ui @@ -833,6 +825,17 @@ impl Prepared { .pass_state_mut(|state| state.scroll_target[d].take()); if scroll_enabled[d] { + let (scroll_delta_0, scroll_delta_1) = content_ui.ctx().pass_state_mut(|state| { + ( + std::mem::take(&mut state.scroll_delta.0[d]), + std::mem::take(&mut state.scroll_delta.1), + ) + }); + + // PassState::scroll_delta is inverted from the way we apply the delta, so we need to negate it. + let mut delta = -scroll_delta_0; + let mut animation = scroll_delta_1; + if let Some(target) = scroll_target { let pass_state::ScrollTarget { range,