skyler
/
egui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ScrollArea: Prevent drag interaction outside the area (#4611) 

<!--
Please read the "Making a PR" section of
[`CONTRIBUTING.md`](https://github.com/emilk/egui/blob/master/CONTRIBUTING.md)
before opening a Pull Request!

* Keep your PR:s small and focused.
* The PR title is what ends up in the changelog, so make it descriptive!
* If applicable, add a screenshot or gif.
* If it is a non-trivial addition, consider adding a demo for it to
`egui_demo_lib`, or a new example.
* Do NOT open PR:s from your `master` branch, as that makes it hard for
maintainers to add commits to your PR.
* Remember to run `cargo fmt` and `cargo clippy`.
* Open the PR as a draft until you have self-reviewed it and run
`./scripts/check.sh`.
* When you have addressed a PR comment, mark it as resolved.

Please be patient! I will review your PR, but my time is limited!
-->

* Closes https://github.com/emilk/egui/issues/4349
This commit is contained in:
Sven Niederberger 2024-06-06 15:36:20 +02:00 committed by GitHub
parent 29b12e1760
commit 1f008fb730
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
crates/egui/src/containers/scroll_area.rs
View File

@ -39,6 +39,9 @@ pub struct State {
/// and remains that way until the user moves the scroll_handle. Once unstuck (false)
/// it remains false until the scroll touches the end position, which reenables stickiness.
scroll_stuck_to_end: Vec2b,
/// Area that can be dragged. This is the size of the content from the last frame.
interact_rect: Option<Rect>,
}
impl Default for State {
@ -52,6 +55,7 @@ impl Default for State {
vel: Vec2::ZERO,
scroll_start_offset_from_top_left: [None; 2],
scroll_stuck_to_end: Vec2b::TRUE,
interact_rect: None,
}
}
}
@ -591,9 +595,11 @@ impl ScrollArea {
// Drag contents to scroll (for touch screens mostly).
// We must do this BEFORE adding content to the `ScrollArea`,
// or we will steal input from the widgets we contain.
let content_response = ui.interact(inner_rect, id.with("area"), Sense::drag());
let content_response_option = state
.interact_rect
.map(|rect| ui.interact(rect, id.with("area"), Sense::drag()));
if content_response.dragged() {
if content_response_option.map(|response| response.dragged()) == Some(true) {
for d in 0..2 {
if scroll_enabled[d] {
ui.input(|input| {
@ -1199,6 +1205,7 @@ impl Prepared {
state.show_scroll = show_scroll_this_frame;
state.content_is_too_large = content_is_too_large;
state.interact_rect = Some(inner_rect);
state.store(ui.ctx(), id);