Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix: scroll_with_delta() for ScrollArea::vertical() and ScrollArea::horizontal() #4584

Closed
wants to merge 2 commits into from
Closed

Fix: scroll_with_delta() for ScrollArea::vertical() and ScrollArea::horizontal() #4584

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dfcead3
Update scroll_area.rs
rustbasic May 30, 2024
1ae51dd
Merge branch 'emilk:master' into patch60
rustbasic Jul 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions crates/egui/src/containers/scroll_area.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -793,21 +793,21 @@ impl Prepared {

let content_size = content_ui.min_size();

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

for d in 0..2 {
// FrameState::scroll_delta is inverted from the way we apply the delta, so we need to negate it.
let mut delta = -scroll_delta[d];

// 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
.ctx()
.frame_state_mut(|state| state.scroll_target[d].take());

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

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

delta += if let Some((target_range, align)) = scroll_target {
let min = content_ui.min_rect().min[d];
let clip_rect = content_ui.clip_rect();
Expand Down
Loading