summaryrefslogtreecommitdiffstats
path: root/widget/src/scrollable.rs
diff options
context:
space:
mode:
authorLibravatar Héctor Ramón <hector@hecrj.dev>2024-04-14 13:43:10 +0200
committerLibravatar GitHub <noreply@github.com>2024-04-14 13:43:10 +0200
commit105b8bd5ad6ade1f203a0d8b0b93bd06f61f621a (patch)
tree4a5efa021b0dbe7d87ff57993c118753a32ea241 /widget/src/scrollable.rs
parentee105e3bee1bc676dcf3324693984ccda8e4e733 (diff)
parentdbbbadfc950dfdfd02c7abbbf993e0685ca0f64a (diff)
downloadiced-105b8bd5ad6ade1f203a0d8b0b93bd06f61f621a.tar.gz
iced-105b8bd5ad6ade1f203a0d8b0b93bd06f61f621a.tar.bz2
iced-105b8bd5ad6ade1f203a0d8b0b93bd06f61f621a.zip
Merge pull request #2382 from iced-rs/wgpu/better-architecture
Improved architecture for `iced_wgpu` and `iced_tiny_skia`
Diffstat (limited to 'widget/src/scrollable.rs')
-rw-r--r--widget/src/scrollable.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/widget/src/scrollable.rs b/widget/src/scrollable.rs
index 84e9ac15..668c5372 100644
--- a/widget/src/scrollable.rs
+++ b/widget/src/scrollable.rs
@@ -651,7 +651,7 @@ where
defaults: &renderer::Style,
layout: Layout<'_>,
cursor: mouse::Cursor,
- _viewport: &Rectangle,
+ viewport: &Rectangle,
) {
let state = tree.state.downcast_ref::<State>();
@@ -767,8 +767,8 @@ where
renderer.with_layer(
Rectangle {
- width: bounds.width + 2.0,
- height: bounds.height + 2.0,
+ width: (bounds.width + 2.0).min(viewport.width),
+ height: (bounds.height + 2.0).min(viewport.height),
..bounds
},
|renderer| {