me/iced
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Expose scrollable offset properly

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2019-10-27 01:24:08 +02:00
parent 719c073fc6
commit 09bd2c46c0
4 changed files with 44 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

11
wgpu/src/renderer/scrollable.rs
View file

@ -16,11 +16,10 @@ impl scrollable::Renderer for Renderer {
let content = layout.children().next().unwrap();
let content_bounds = content.bounds();
let offset = scrollable.state.offset(bounds, content_bounds);
let cursor_position = if bounds.contains(cursor_position) {
Point::new(
cursor_position.x,
cursor_position.y + scrollable.state.offset as f32,
)
Point::new(cursor_position.x, cursor_position.y + offset as f32)
} else {
Point::new(cursor_position.x, -1.0)
};
@ -30,7 +29,7 @@ impl scrollable::Renderer for Renderer {
let primitive = Primitive::Scrollable {
bounds,
offset: scrollable.state.offset,
offset,
content: Box::new(content),
};
@ -41,7 +40,7 @@ impl scrollable::Renderer for Renderer {
{
let ratio = bounds.height / content_bounds.height;
let scrollbar_height = bounds.height * ratio;
let y_offset = scrollable.state.offset as f32 * ratio;
let y_offset = offset as f32 * ratio;
let scrollbar = Primitive::Quad {
bounds: Rectangle {