Fix scroll_with_delta only scrolling if the ScrollArea is focussed #4303
+49
−27
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
lucasmerlin
force-pushed
the
fix-scroll_with_delta
branch
from
366e756
to
46d2303
Compare
emilk
reviewed
Apr 2, 2024
crates/egui/src/ui.rs
Outdated
Comment on lines
1095
to
1096
| input.smooth_scroll_delta += delta; | ||
| input.force_current_scroll_area = true; |
There was a problem hiding this comment.
I think a better fix is to add a scroll_delta to FrameState, alongside FrameState::scroll_target
There was a problem hiding this comment.
That is indeed much nicer 👍 I've updated my PR
lucasmerlin
force-pushed
the
fix-scroll_with_delta
branch
from
74d74f9
to
5c4c191
Compare
emilk
reviewed
Apr 21, 2024
crates/egui/src/frame_state.rs
Outdated
| pub(crate) scroll_target: [Option<(Rangef, Option<Align>)>; 2], | ||
|
|
||
| /// The current scroll area should scroll by this much (horizontal, vertical). | ||
| pub(crate) scroll_delta: [Option<f32>; 2], |
There was a problem hiding this comment.
This could just be a Vec2, no?
Suggested change
| pub(crate) scroll_delta: [Option<f32>; 2], | |
| pub(crate) scroll_delta: Vec2, |
There was a problem hiding this comment.
Updated. I think we could also update scroll_target to be Option<[(..); 2]> instead of [Option<(..)>; 2]. That would make the code in Prepared::end a bit cleaner. I don't think a single direction is ever read / set alone, it's always both directions at once. Should I include that change as well?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This introduces the boolean field force_current_scroll_area to InputState which will be set when scroll_with_delta is called, causing the ScrollArea to skip the check whether it is focused and always consume the smooth scroll delta.
scroll_with_deltadoesn't work #2783