diff options
| author |  Gigas002 <24297712+Gigas002@users.noreply.github.com> | 2024-04-16 00:08:17 +0900 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2024-04-16 00:08:17 +0900 |
| commit | 0ebe0629cef37aee5c48b9409fc36618a3a3e60d (patch) | |
| tree | 909d9ecf28e7c491bae3afc81928c118517fa7a9 /widget/src/scrollable.rs | |
| parent | 13bd106fc585034a7aba17b9c17589113274aaf5 (diff) | |
| parent | 105b8bd5ad6ade1f203a0d8b0b93bd06f61f621a (diff) | |
| download | iced-0ebe0629cef37aee5c48b9409fc36618a3a3e60d.tar.gz iced-0ebe0629cef37aee5c48b9409fc36618a3a3e60d.tar.bz2 iced-0ebe0629cef37aee5c48b9409fc36618a3a3e60d.zip | |
Merge branch 'iced-rs:master' into viewer_content_fit
Diffstat (limited to 'widget/src/scrollable.rs')
| -rw-r--r-- | widget/src/scrollable.rs | 6 |
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| { |