Fix: scroll_with_delta() for ScrollArea::vertical() and ScrollArea::horizontal()
#4893
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
rustbasic
changed the title
scroll_with_delta() for ScrollArea::vertical() and ScrollArea::horizontal()
bircni
reviewed
Aug 2, 2024
| // 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_0, scroll_delta_1) = content_ui.ctx().frame_state_mut(|state| { |
There was a problem hiding this comment.
This could also be solved by using less lines of code if wanted
let (mut delta, mut animation) = content_ui.ctx().frame_state_mut(|state| {
(
-std::mem::take(&mut state.scroll_delta.0[d]),
std::mem::take(&mut state.scroll_delta.1),
)
});There was a problem hiding this comment.
Using - here is bad for readability.
It's okay to do let (scroll_delta, scroll_animation), but since it's only used temporarily, it's not a big problem.
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.
Fix:
scroll_with_delta()forScrollArea::vertical()andScrollArea::horizontal()We need to do this in order for
ScrollArea::vertical()andScrollArea::horizontal()to work even where they are divided or nested.Pull requests :
Ui::scroll_with_deltaonly scrolling if theScrollAreais focused #4303scroll_to_*animations configurable #4305scroll_with_delta()forScrollArea::vertical()andScrollArea::horizontal()#4584