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

Draw scrollbar on top of scrollable content

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2019-10-29 02:00:17 +01:00
parent 23ebfb707a
commit be488ac738
2 changed files with 41 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -34,34 +34,31 @@ impl scrollable::Renderer for Renderer {
};
(
Primitive::Group {
primitives: if is_mouse_over
&& content_bounds.height > bounds.height
{
let ratio = bounds.height / content_bounds.height;
let scrollbar_height = bounds.height * ratio;
let y_offset = offset as f32 * ratio;
if is_mouse_over && content_bounds.height > bounds.height {
let ratio = bounds.height / content_bounds.height;
let scrollbar_height = bounds.height * ratio;
let y_offset = offset as f32 * ratio;
let scrollbar = Primitive::Quad {
bounds: Rectangle {
x: bounds.x + bounds.width - 12.0,
y: bounds.y + y_offset,
width: 10.0,
height: scrollbar_height,
},
background: Background::Color(Color {
r: 0.0,
g: 0.0,
b: 0.0,
a: 0.5,
}),
border_radius: 5,
};
vec![primitive, scrollbar]
} else {
vec![primitive]
},
let scrollbar = Primitive::Quad {
bounds: Rectangle {
x: bounds.x + bounds.width - 12.0,
y: bounds.y + y_offset,
width: 10.0,
height: scrollbar_height,
},
background: Background::Color(Color {
r: 0.0,
g: 0.0,
b: 0.0,
a: 0.7,
}),
border_radius: 5,
};
Primitive::Group {
primitives: vec![primitive, scrollbar],
}
} else {
primitive
},
mouse_cursor,
)