From 7163e1d8b669b61d6fba6528c2a28fde3bfb72a0 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Mon, 30 Dec 2019 19:17:00 +0100
Subject: Implement `Default` for `iced_wgpu::Primitive`
---
wgpu/src/primitive.rs | 6 ++++++
1 file changed, 6 insertions(+)
(limited to 'wgpu/src')
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
+ }
+}
--
cgit
From 8426bf953cb50f3b7fcb1e0ec8c2fdf22d2b01af Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Mon, 30 Dec 2019 19:20:59 +0100
Subject: Implement `Empty` widget
It can be useful if you want to fill some space with nothing.
---
wgpu/src/renderer/widget.rs | 1 +
wgpu/src/renderer/widget/empty.rs | 8 ++++++++
2 files changed, 9 insertions(+)
create mode 100644 wgpu/src/renderer/widget/empty.rs
(limited to 'wgpu/src')
diff --git a/wgpu/src/renderer/widget.rs b/wgpu/src/renderer/widget.rs
index 91f107e8..f2d443fb 100644
--- a/wgpu/src/renderer/widget.rs
+++ b/wgpu/src/renderer/widget.rs
@@ -1,6 +1,7 @@
mod button;
mod checkbox;
mod column;
+mod empty;
mod image;
mod radio;
mod row;
diff --git a/wgpu/src/renderer/widget/empty.rs b/wgpu/src/renderer/widget/empty.rs
new file mode 100644
index 00000000..26ee74b4
--- /dev/null
+++ b/wgpu/src/renderer/widget/empty.rs
@@ -0,0 +1,8 @@
+use crate::{Primitive, Renderer};
+use iced_native::{empty, MouseCursor, Rectangle};
+
+impl empty::Renderer for Renderer {
+ fn draw(&mut self, _bounds: Rectangle) -> Self::Output {
+ (Primitive::None, MouseCursor::OutOfBounds)
+ }
+}
--
cgit
From 3a327e08e96d9588d145c32afe4f04f37a8f0f0f Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Mon, 30 Dec 2019 21:32:21 +0100
Subject: Rename `Empty` widget to `Space`
---
wgpu/src/renderer/widget.rs | 2 +-
wgpu/src/renderer/widget/empty.rs | 8 --------
wgpu/src/renderer/widget/space.rs | 8 ++++++++
3 files changed, 9 insertions(+), 9 deletions(-)
delete mode 100644 wgpu/src/renderer/widget/empty.rs
create mode 100644 wgpu/src/renderer/widget/space.rs
(limited to 'wgpu/src')
diff --git a/wgpu/src/renderer/widget.rs b/wgpu/src/renderer/widget.rs
index f2d443fb..f82631d5 100644
--- a/wgpu/src/renderer/widget.rs
+++ b/wgpu/src/renderer/widget.rs
@@ -1,12 +1,12 @@
mod button;
mod checkbox;
mod column;
-mod empty;
mod image;
mod radio;
mod row;
mod scrollable;
mod slider;
+mod space;
mod text;
mod text_input;
diff --git a/wgpu/src/renderer/widget/empty.rs b/wgpu/src/renderer/widget/empty.rs
deleted file mode 100644
index 26ee74b4..00000000
--- a/wgpu/src/renderer/widget/empty.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-use crate::{Primitive, Renderer};
-use iced_native::{empty, MouseCursor, Rectangle};
-
-impl empty::Renderer for Renderer {
- fn draw(&mut self, _bounds: Rectangle) -> Self::Output {
- (Primitive::None, MouseCursor::OutOfBounds)
- }
-}
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)
+ }
+}
--
cgit