forestia/bevy
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed scroll offset clamping to include scrollbar size.

Browse Source
This commit is contained in:
ickshonpe 2025-07-11 16:00:13 +01:00
parent 931b8e29e0
commit 3e02fd4160
1 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
crates/bevy_ui/src/layout/mod.rs
View File

@ -327,20 +327,11 @@ with UI components as a child of an entity without UI components, your UI layout
}) })
.unwrap_or_default(); .unwrap_or_default();
let max_possible_offset = (content_size - layout_size).max(Vec2::ZERO); let max_possible_offset =
let clamped_scroll_position = scroll_position.clamp( (content_size - layout_size + node.scrollbar_size).max(Vec2::ZERO);
Vec2::ZERO, let clamped_scroll_position = scroll_position.clamp(Vec2::ZERO, max_possible_offset);
max_possible_offset * inverse_target_scale_factor,
);
if clamped_scroll_position != scroll_position { let physical_scroll_position = clamped_scroll_position.floor();
commands
.entity(entity)
.insert(ScrollPosition(clamped_scroll_position));
}
let physical_scroll_position =
(clamped_scroll_position / inverse_target_scale_factor).round();
for child_uinode in ui_children.iter_ui_children(entity) { for child_uinode in ui_children.iter_ui_children(entity) {
update_uinode_geometry_recursive( update_uinode_geometry_recursive(