summaryrefslogtreecommitdiffstats
path: root/wgpu/src/renderer/scrollable.rs
diff options
context:
space:
mode:
Diffstat (limited to 'wgpu/src/renderer/scrollable.rs')
-rw-r--r--wgpu/src/renderer/scrollable.rs16
1 files changed, 6 insertions, 10 deletions
diff --git a/wgpu/src/renderer/scrollable.rs b/wgpu/src/renderer/scrollable.rs
index e812a7e1..360759a5 100644
--- a/wgpu/src/renderer/scrollable.rs
+++ b/wgpu/src/renderer/scrollable.rs
@@ -1,7 +1,7 @@
use crate::{Primitive, Renderer};
use iced_native::{
scrollable, Background, Color, Layout, MouseCursor, Point, Rectangle,
- Scrollable, Widget,
+ Scrollable, Vector, Widget,
};
const SCROLLBAR_WIDTH: u16 = 10;
@@ -56,9 +56,9 @@ impl scrollable::Renderer for Renderer {
let (content, mouse_cursor) =
scrollable.content.draw(self, content, cursor_position);
- let primitive = Primitive::Clip {
+ let clip = Primitive::Clip {
bounds,
- offset,
+ offset: Vector::new(0, offset),
content: Box::new(content),
};
@@ -107,19 +107,15 @@ impl scrollable::Renderer for Renderer {
};
Primitive::Group {
- primitives: vec![
- primitive,
- scrollbar_background,
- scrollbar,
- ],
+ primitives: vec![clip, scrollbar_background, scrollbar],
}
} else {
Primitive::Group {
- primitives: vec![primitive, scrollbar],
+ primitives: vec![clip, scrollbar],
}
}
} else {
- primitive
+ clip
},
if is_mouse_over_scrollbar
|| scrollable.state.is_scrollbar_grabbed()