Rename iced_virtual to iced_pure
`virtual` is a reserved keyword in Rust 😬
This commit is contained in:
parent
e03de01988
commit
897188317b
15 changed files with 16 additions and 15 deletions
|
|
@ -57,8 +57,8 @@ members = [
|
||||||
"glutin",
|
"glutin",
|
||||||
"lazy",
|
"lazy",
|
||||||
"native",
|
"native",
|
||||||
|
"pure",
|
||||||
"style",
|
"style",
|
||||||
"virtual",
|
|
||||||
"wgpu",
|
"wgpu",
|
||||||
"winit",
|
"winit",
|
||||||
"examples/bezier_tool",
|
"examples/bezier_tool",
|
||||||
|
|
@ -88,7 +88,7 @@ members = [
|
||||||
"examples/tooltip",
|
"examples/tooltip",
|
||||||
"examples/tour",
|
"examples/tour",
|
||||||
"examples/url_handler",
|
"examples/url_handler",
|
||||||
"examples/virtual_counter",
|
"examples/pure/counter",
|
||||||
"examples/websocket",
|
"examples/websocket",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,10 +1,10 @@
|
||||||
[package]
|
[package]
|
||||||
name = "virtual_counter"
|
name = "pure_counter"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
authors = ["Héctor Ramón Jiménez <hector0193@gmail.com>"]
|
authors = ["Héctor Ramón Jiménez <hector0193@gmail.com>"]
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
publish = false
|
publish = false
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
iced = { path = "../.." }
|
iced = { path = "../../.." }
|
||||||
iced_virtual = { path = "../../virtual" }
|
iced_pure = { path = "../../../pure" }
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
use iced::{Alignment, Element, Sandbox, Settings};
|
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 {
|
pub fn main() -> iced::Result {
|
||||||
Counter::run(Settings::default())
|
Counter::run(Settings::default())
|
||||||
|
|
@ -7,7 +7,7 @@ pub fn main() -> iced::Result {
|
||||||
|
|
||||||
struct Counter {
|
struct Counter {
|
||||||
value: i32,
|
value: i32,
|
||||||
state: iced_virtual::State<Message, iced::Renderer>,
|
state: State<Message, iced::Renderer>,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug, Clone, Copy)]
|
#[derive(Debug, Clone, Copy)]
|
||||||
|
|
@ -22,7 +22,7 @@ impl Sandbox for Counter {
|
||||||
fn new() -> Self {
|
fn new() -> Self {
|
||||||
Self {
|
Self {
|
||||||
value: 0,
|
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()
|
let content = Column::new()
|
||||||
.padding(20)
|
.padding(20)
|
||||||
.align_items(Alignment::Center)
|
.align_items(Alignment::Center)
|
||||||
|
|
@ -49,6 +49,6 @@ impl Sandbox for Counter {
|
||||||
.push(Text::new(self.value.to_string()).size(50))
|
.push(Text::new(self.value.to_string()).size(50))
|
||||||
.push(Button::new("Decrement").on_press(Message::DecrementPressed));
|
.push(Button::new("Decrement").on_press(Message::DecrementPressed));
|
||||||
|
|
||||||
Virtual::new(&mut self.state, content).into()
|
Pure::new(&mut self.state, content).into()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
[package]
|
[package]
|
||||||
name = "iced_virtual"
|
name = "iced_pure"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
|
|
||||||
1
pure/src/application.rs
Normal file
1
pure/src/application.rs
Normal file
|
|
@ -0,0 +1 @@
|
||||||
|
|
||||||
|
|
@ -10,11 +10,11 @@ use iced_native::mouse;
|
||||||
use iced_native::renderer;
|
use iced_native::renderer;
|
||||||
use iced_native::{Clipboard, Hasher, Length, Point, Rectangle, Shell};
|
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>,
|
state: &'a mut State<Message, Renderer>,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<'a, Message, Renderer> Virtual<'a, Message, Renderer>
|
impl<'a, Message, Renderer> Pure<'a, Message, Renderer>
|
||||||
where
|
where
|
||||||
Message: 'static,
|
Message: 'static,
|
||||||
Renderer: iced_native::Renderer + 'static,
|
Renderer: iced_native::Renderer + 'static,
|
||||||
|
|
@ -56,7 +56,7 @@ where
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<'a, Message, Renderer> iced_native::Widget<Message, Renderer>
|
impl<'a, Message, Renderer> iced_native::Widget<Message, Renderer>
|
||||||
for Virtual<'a, Message, Renderer>
|
for Pure<'a, Message, Renderer>
|
||||||
where
|
where
|
||||||
Renderer: iced_native::Renderer,
|
Renderer: iced_native::Renderer,
|
||||||
{
|
{
|
||||||
|
|
@ -136,7 +136,7 @@ where
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<'a, Message, Renderer> Into<iced_native::Element<'a, Message, Renderer>>
|
impl<'a, Message, Renderer> Into<iced_native::Element<'a, Message, Renderer>>
|
||||||
for Virtual<'a, Message, Renderer>
|
for Pure<'a, Message, Renderer>
|
||||||
where
|
where
|
||||||
Renderer: iced_native::Renderer,
|
Renderer: iced_native::Renderer,
|
||||||
{
|
{
|
||||||
Loading…
Add table
Add a link
Reference in a new issue