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

egui: fix scroll not sticking when scrollbar is hidden #3434

Merged
merged 2 commits into from
Nov 15, 2023
Merged

egui: fix scroll not sticking when scrollbar is hidden #3434

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bbcd93b
Fix scroll sticking when scrollbars are not visible
LoganDark Oct 3, 2023
c4909e1
Merge branch 'master' of https://github.com/emilk/egui into stick-to-…
LoganDark Nov 10, 2023
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
10 changes: 5 additions & 5 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 @@ -736,6 +736,11 @@ impl Prepared {
}

for d in 0..2 {
// maybe force increase in offset to keep scroll stuck to end position
if stick_to_end[d] && state.scroll_stuck_to_end[d] {
state.offset[d] = content_size[d] - inner_rect.size()[d];
}

let animation_t = current_bar_use[1 - d] / max_scroll_bar_width;

if animation_t == 0.0 {
Expand Down Expand Up @@ -777,11 +782,6 @@ impl Prepared {
)
};

// maybe force increase in offset to keep scroll stuck to end position
if stick_to_end[d] && state.scroll_stuck_to_end[d] {
state.offset[d] = content_size[d] - inner_rect.size()[d];
}

let from_content =
|content| remap_clamp(content, 0.0..=content_size[d], min_main..=max_main);

Expand Down