diff options
author | 2019-12-31 11:37:41 +0100 | |
---|---|---|
committer | 2019-12-31 11:37:41 +0100 | |
commit | e98471d5b60d34e54defaba6e5979ff881e380e6 (patch) | |
tree | 428d923a092bc710697762e048d7a95505cc7085 /wgpu | |
parent | fb9cc0262b30a953e8188897b74abb5106ea1fd8 (diff) | |
parent | 26de688e68347e1f6e388d01014eac89cea71afa (diff) | |
download | iced-e98471d5b60d34e54defaba6e5979ff881e380e6.tar.gz iced-e98471d5b60d34e54defaba6e5979ff881e380e6.tar.bz2 iced-e98471d5b60d34e54defaba6e5979ff881e380e6.zip |
Merge branch 'master' into feature/custom-styling
Diffstat (limited to 'wgpu')
-rw-r--r-- | wgpu/src/primitive.rs | 6 | ||||
-rw-r--r-- | wgpu/src/renderer/widget.rs | 1 | ||||
-rw-r--r-- | wgpu/src/renderer/widget/space.rs | 8 |
3 files changed, 15 insertions, 0 deletions
diff --git a/wgpu/src/primitive.rs b/wgpu/src/primitive.rs index 958cc17f..6c61f800 100644 --- a/wgpu/src/primitive.rs +++ b/wgpu/src/primitive.rs @@ -64,3 +64,9 @@ pub enum Primitive { content: Box<Primitive>, }, } + +impl Default for Primitive { + fn default() -> Primitive { + Primitive::None + } +} diff --git a/wgpu/src/renderer/widget.rs b/wgpu/src/renderer/widget.rs index 8cf79cb0..daf35cbe 100644 --- a/wgpu/src/renderer/widget.rs +++ b/wgpu/src/renderer/widget.rs @@ -7,6 +7,7 @@ mod radio; mod row; mod scrollable; mod slider; +mod space; mod text; mod text_input; diff --git a/wgpu/src/renderer/widget/space.rs b/wgpu/src/renderer/widget/space.rs new file mode 100644 index 00000000..28e05437 --- /dev/null +++ b/wgpu/src/renderer/widget/space.rs @@ -0,0 +1,8 @@ +use crate::{Primitive, Renderer}; +use iced_native::{space, MouseCursor, Rectangle}; + +impl space::Renderer for Renderer { + fn draw(&mut self, _bounds: Rectangle) -> Self::Output { + (Primitive::None, MouseCursor::OutOfBounds) + } +} |