Skip to content

Commit

Permalink
Update scroll_area.rs
Browse files Browse the repository at this point in the history
  • Loading branch information
rustbasic authored Aug 1, 2024
1 parent e621130 commit 506e07c
Showing 1 changed file with 7 additions and 6 deletions.
13 changes: 7 additions & 6 deletions crates/egui/src/containers/scroll_area.rs
Original file line number Diff line number Diff line change
Expand Up @@ -793,6 +793,10 @@ impl Prepared {

let content_size = content_ui.min_size();

let scroll_delta_1 = content_ui
.ctx()
.frame_state_mut(|state| std::mem::take(&mut state.scroll_delta.1));

for d in 0..2 {
// We always take both scroll targets regardless of which scroll axes are enabled. This
// is to avoid them leaking to other scroll areas.
Expand All @@ -801,12 +805,9 @@ impl Prepared {
.frame_state_mut(|state| state.scroll_target[d].take());

if scroll_enabled[d] {
let (scroll_delta_0, scroll_delta_1) = content_ui.ctx().frame_state_mut(|state| {
(
std::mem::take(&mut state.scroll_delta.0[d]),
std::mem::take(&mut state.scroll_delta.1),
)
});
let scroll_delta_0 = content_ui
.ctx()
.frame_state_mut(|state| std::mem::take(&mut state.scroll_delta.0[d]));

// FrameState::scroll_delta is inverted from the way we apply the delta, so we need to negate it.
let mut delta = -scroll_delta_0;
Expand Down

0 comments on commit 506e07c

Please sign in to comment.