Skip to content

Fix full_ui example overflowing scroll position #20401

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

Merged
merged 3 commits into from
Aug 5, 2025
Merged

Fix full_ui example overflowing scroll position #20401

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d3b96b1
Fix full_ui example overflowing scroll position
nekonimous Aug 3, 2025
65f2f8d
Clearer math
alice-i-cecile Aug 4, 2025
9f2a338
fmt
nekonimous Aug 4, 2025
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
15 changes: 12 additions & 3 deletions examples/testbed/full_ui.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ use bevy::{
basic::LIME,
css::{DARK_GRAY, NAVY},
},
core_widgets::CoreScrollbar,
input::mouse::{MouseScrollUnit, MouseWheel},
picking::hover::HoverMap,
prelude::*,
Expand Down Expand Up @@ -437,7 +438,7 @@ fn toggle_debug_overlay(
pub fn update_scroll_position(
mut mouse_wheel_events: EventReader<MouseWheel>,
hover_map: Res<HoverMap>,
mut scrolled_node_query: Query<&mut ScrollPosition>,
mut scrolled_node_query: Query<(&mut ScrollPosition, &ComputedNode), Without<CoreScrollbar>>,
keyboard_input: Res<ButtonInput<KeyCode>>,
) {
for mouse_wheel_event in mouse_wheel_events.read() {
Expand All @@ -453,9 +454,17 @@ pub fn update_scroll_position(

for (_pointer, pointer_map) in hover_map.iter() {
for (entity, _hit) in pointer_map.iter() {
if let Ok(mut scroll_position) = scrolled_node_query.get_mut(*entity) {
if let Ok((mut scroll_position, scroll_content)) =
scrolled_node_query.get_mut(*entity)
{
let visible_size = scroll_content.size();
let content_size = scroll_content.content_size();

let range = (content_size.y - visible_size.y).max(0.)
* scroll_content.inverse_scale_factor;

scroll_position.x -= dx;
scroll_position.y -= dy;
scroll_position.y = (scroll_position.y - dy).clamp(0., range);
}
}
}
Expand Down
Loading