diff options
author | 2020-03-20 12:10:52 +0100 | |
---|---|---|
committer | 2020-03-20 12:10:52 +0100 | |
commit | f7ec679fec1b69c6dc5bc12d60627629f086bf22 (patch) | |
tree | 58ec4dd11e50f11ef85b972fee211930e7a0e7c0 /wgpu/src/renderer/widget/scrollable.rs | |
parent | 93f5640a2dc06d8f1bf2b0d033d45c62f8985380 (diff) | |
parent | fb744a338c1b7566a3db9a3d24c03729b4858217 (diff) | |
download | iced-f7ec679fec1b69c6dc5bc12d60627629f086bf22.tar.gz iced-f7ec679fec1b69c6dc5bc12d60627629f086bf22.tar.bz2 iced-f7ec679fec1b69c6dc5bc12d60627629f086bf22.zip |
Merge pull request #224 from hecrj/feature/panes-widget
Pane grid widget
Diffstat (limited to 'wgpu/src/renderer/widget/scrollable.rs')
-rw-r--r-- | wgpu/src/renderer/widget/scrollable.rs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/wgpu/src/renderer/widget/scrollable.rs b/wgpu/src/renderer/widget/scrollable.rs index bfee7411..732523e3 100644 --- a/wgpu/src/renderer/widget/scrollable.rs +++ b/wgpu/src/renderer/widget/scrollable.rs @@ -58,14 +58,14 @@ impl scrollable::Renderer for Renderer { style_sheet: &Self::Style, (content, mouse_cursor): Self::Output, ) -> Self::Output { - let clip = Primitive::Clip { - bounds, - offset: Vector::new(0, offset), - content: Box::new(content), - }; - ( if let Some(scrollbar) = scrollbar { + let clip = Primitive::Clip { + bounds, + offset: Vector::new(0, offset), + content: Box::new(content), + }; + let style = if state.is_scroller_grabbed() { style_sheet.dragging() } else if is_mouse_over_scrollbar { @@ -115,7 +115,7 @@ impl scrollable::Renderer for Renderer { primitives: vec![clip, scrollbar, scroller], } } else { - clip + content }, if is_mouse_over_scrollbar || state.is_scroller_grabbed() { MouseCursor::Idle |