diff options
author | 2022-02-11 17:50:12 +0700 | |
---|---|---|
committer | 2022-02-11 17:50:12 +0700 | |
commit | 897188317b5875cc00a0f1c797790df8ac13687f (patch) | |
tree | 2a2eeedc8d582f616eaa0030000d15d403c1092b | |
parent | e03de019881f31d69b70a64c3e278ae5200d5080 (diff) | |
download | iced-897188317b5875cc00a0f1c797790df8ac13687f.tar.gz iced-897188317b5875cc00a0f1c797790df8ac13687f.tar.bz2 iced-897188317b5875cc00a0f1c797790df8ac13687f.zip |
Rename `iced_virtual` to `iced_pure`
`virtual` is a reserved keyword in Rust :grimacing:
Diffstat (limited to '')
-rw-r--r-- | Cargo.toml | 4 | ||||
-rw-r--r-- | examples/pure/counter/Cargo.toml (renamed from examples/virtual_counter/Cargo.toml) | 6 | ||||
-rw-r--r-- | examples/pure/counter/README.md (renamed from examples/virtual_counter/README.md) | 0 | ||||
-rw-r--r-- | examples/pure/counter/index.html (renamed from examples/virtual_counter/index.html) | 0 | ||||
-rw-r--r-- | examples/pure/counter/src/main.rs (renamed from examples/virtual_counter/src/main.rs) | 10 | ||||
-rw-r--r-- | pure/Cargo.toml (renamed from virtual/Cargo.toml) | 2 | ||||
-rw-r--r-- | pure/src/application.rs | 1 | ||||
-rw-r--r-- | pure/src/flex.rs (renamed from virtual/src/flex.rs) | 0 | ||||
-rw-r--r-- | pure/src/lib.rs (renamed from virtual/src/lib.rs) | 8 | ||||
-rw-r--r-- | pure/src/widget.rs (renamed from virtual/src/widget.rs) | 0 | ||||
-rw-r--r-- | pure/src/widget/button.rs (renamed from virtual/src/widget/button.rs) | 0 | ||||
-rw-r--r-- | pure/src/widget/column.rs (renamed from virtual/src/widget/column.rs) | 0 | ||||
-rw-r--r-- | pure/src/widget/element.rs (renamed from virtual/src/widget/element.rs) | 0 | ||||
-rw-r--r-- | pure/src/widget/text.rs (renamed from virtual/src/widget/text.rs) | 0 | ||||
-rw-r--r-- | pure/src/widget/tree.rs (renamed from virtual/src/widget/tree.rs) | 0 |
15 files changed, 16 insertions, 15 deletions
@@ -57,8 +57,8 @@ members = [ "glutin", "lazy", "native", + "pure", "style", - "virtual", "wgpu", "winit", "examples/bezier_tool", @@ -88,7 +88,7 @@ members = [ "examples/tooltip", "examples/tour", "examples/url_handler", - "examples/virtual_counter", + "examples/pure/counter", "examples/websocket", ] diff --git a/examples/virtual_counter/Cargo.toml b/examples/pure/counter/Cargo.toml index 537d4174..1363bfd5 100644 --- a/examples/virtual_counter/Cargo.toml +++ b/examples/pure/counter/Cargo.toml @@ -1,10 +1,10 @@ [package] -name = "virtual_counter" +name = "pure_counter" version = "0.1.0" authors = ["Héctor Ramón Jiménez <hector0193@gmail.com>"] edition = "2021" publish = false [dependencies] -iced = { path = "../.." } -iced_virtual = { path = "../../virtual" } +iced = { path = "../../.." } +iced_pure = { path = "../../../pure" } diff --git a/examples/virtual_counter/README.md b/examples/pure/counter/README.md index 4d9fc5b9..4d9fc5b9 100644 --- a/examples/virtual_counter/README.md +++ b/examples/pure/counter/README.md diff --git a/examples/virtual_counter/index.html b/examples/pure/counter/index.html index d2e368e4..d2e368e4 100644 --- a/examples/virtual_counter/index.html +++ b/examples/pure/counter/index.html diff --git a/examples/virtual_counter/src/main.rs b/examples/pure/counter/src/main.rs index 10d32112..e2746d40 100644 --- a/examples/virtual_counter/src/main.rs +++ b/examples/pure/counter/src/main.rs @@ -1,5 +1,5 @@ use iced::{Alignment, Element, Sandbox, Settings}; -use iced_virtual::{Button, Column, Text, Virtual}; +use iced_pure::{Button, Column, Pure, State, Text}; pub fn main() -> iced::Result { Counter::run(Settings::default()) @@ -7,7 +7,7 @@ pub fn main() -> iced::Result { struct Counter { value: i32, - state: iced_virtual::State<Message, iced::Renderer>, + state: State<Message, iced::Renderer>, } #[derive(Debug, Clone, Copy)] @@ -22,7 +22,7 @@ impl Sandbox for Counter { fn new() -> Self { Self { value: 0, - state: iced_virtual::State::new(), + state: State::new(), } } @@ -41,7 +41,7 @@ impl Sandbox for Counter { } } - fn view(&mut self) -> Element<Message> { + fn view(&mut self) -> Element<'_, Message> { let content = Column::new() .padding(20) .align_items(Alignment::Center) @@ -49,6 +49,6 @@ impl Sandbox for Counter { .push(Text::new(self.value.to_string()).size(50)) .push(Button::new("Decrement").on_press(Message::DecrementPressed)); - Virtual::new(&mut self.state, content).into() + Pure::new(&mut self.state, content).into() } } diff --git a/virtual/Cargo.toml b/pure/Cargo.toml index 74960b80..bdfe43ae 100644 --- a/virtual/Cargo.toml +++ b/pure/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "iced_virtual" +name = "iced_pure" version = "0.1.0" edition = "2021" diff --git a/pure/src/application.rs b/pure/src/application.rs new file mode 100644 index 00000000..8b137891 --- /dev/null +++ b/pure/src/application.rs @@ -0,0 +1 @@ + diff --git a/virtual/src/flex.rs b/pure/src/flex.rs index 8d473f08..8d473f08 100644 --- a/virtual/src/flex.rs +++ b/pure/src/flex.rs diff --git a/virtual/src/lib.rs b/pure/src/lib.rs index 8ba4c328..4381bfc8 100644 --- a/virtual/src/lib.rs +++ b/pure/src/lib.rs @@ -10,11 +10,11 @@ use iced_native::mouse; use iced_native::renderer; use iced_native::{Clipboard, Hasher, Length, Point, Rectangle, Shell}; -pub struct Virtual<'a, Message, Renderer> { +pub struct Pure<'a, Message, Renderer> { state: &'a mut State<Message, Renderer>, } -impl<'a, Message, Renderer> Virtual<'a, Message, Renderer> +impl<'a, Message, Renderer> Pure<'a, Message, Renderer> where Message: 'static, Renderer: iced_native::Renderer + 'static, @@ -56,7 +56,7 @@ where } impl<'a, Message, Renderer> iced_native::Widget<Message, Renderer> - for Virtual<'a, Message, Renderer> + for Pure<'a, Message, Renderer> where Renderer: iced_native::Renderer, { @@ -136,7 +136,7 @@ where } impl<'a, Message, Renderer> Into<iced_native::Element<'a, Message, Renderer>> - for Virtual<'a, Message, Renderer> + for Pure<'a, Message, Renderer> where Renderer: iced_native::Renderer, { diff --git a/virtual/src/widget.rs b/pure/src/widget.rs index bf63b999..bf63b999 100644 --- a/virtual/src/widget.rs +++ b/pure/src/widget.rs diff --git a/virtual/src/widget/button.rs b/pure/src/widget/button.rs index ece90811..ece90811 100644 --- a/virtual/src/widget/button.rs +++ b/pure/src/widget/button.rs diff --git a/virtual/src/widget/column.rs b/pure/src/widget/column.rs index 2f70282a..2f70282a 100644 --- a/virtual/src/widget/column.rs +++ b/pure/src/widget/column.rs diff --git a/virtual/src/widget/element.rs b/pure/src/widget/element.rs index 5e40d488..5e40d488 100644 --- a/virtual/src/widget/element.rs +++ b/pure/src/widget/element.rs diff --git a/virtual/src/widget/text.rs b/pure/src/widget/text.rs index e3a7d299..e3a7d299 100644 --- a/virtual/src/widget/text.rs +++ b/pure/src/widget/text.rs diff --git a/virtual/src/widget/tree.rs b/pure/src/widget/tree.rs index 75f50a2f..75f50a2f 100644 --- a/virtual/src/widget/tree.rs +++ b/pure/src/widget/tree.rs |