From 4b8ae71b6311f0e4906e445f099a3fdaf4623212 Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Sun, 10 Jul 2022 15:15:29 +0200 Subject: Add and purify `arc` example by @ThatsNoMoon --- examples/pure/arc/Cargo.toml | 9 +++ examples/pure/arc/README.md | 14 +++++ examples/pure/arc/src/main.rs | 126 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 149 insertions(+) create mode 100644 examples/pure/arc/Cargo.toml create mode 100644 examples/pure/arc/README.md create mode 100644 examples/pure/arc/src/main.rs (limited to 'examples/pure') diff --git a/examples/pure/arc/Cargo.toml b/examples/pure/arc/Cargo.toml new file mode 100644 index 00000000..22113cf1 --- /dev/null +++ b/examples/pure/arc/Cargo.toml @@ -0,0 +1,9 @@ +[package] +name = "arc" +version = "0.1.0" +authors = ["ThatsNoMoon "] +edition = "2021" +publish = false + +[dependencies] +iced = { path = "../../..", features = ["pure", "canvas", "tokio", "debug"] } diff --git a/examples/pure/arc/README.md b/examples/pure/arc/README.md new file mode 100644 index 00000000..4cf99efb --- /dev/null +++ b/examples/pure/arc/README.md @@ -0,0 +1,14 @@ +## arc_to + +An application that uses the `Canvas` widget to draw a rotating arc. + +This is a simple demo for https://github.com/iced-rs/iced/pull/1358. + +The __[`main`]__ file contains all the code of the example. + +You can run it with `cargo run`: +``` +cargo run --package arc_to +``` + +[`main`]: src/main.rs diff --git a/examples/pure/arc/src/main.rs b/examples/pure/arc/src/main.rs new file mode 100644 index 00000000..38b3f502 --- /dev/null +++ b/examples/pure/arc/src/main.rs @@ -0,0 +1,126 @@ +use std::{f32::consts::PI, time::Instant}; + +use iced::executor; +use iced::pure::widget::canvas::{ + self, Cache, Canvas, Cursor, Geometry, Path, Stroke, +}; +use iced::pure::{Application, Element}; +use iced::{ + Color, Command, Length, Point, Rectangle, Settings, Subscription, Theme, +}; + +pub fn main() -> iced::Result { + Arc::run(Settings { + antialiasing: true, + ..Settings::default() + }) +} + +struct Arc { + start: Instant, + cache: Cache, +} + +#[derive(Debug, Clone, Copy)] +enum Message { + Tick, +} + +impl Application for Arc { + type Executor = executor::Default; + type Message = Message; + type Theme = Theme; + type Flags = (); + + fn new(_flags: ()) -> (Self, Command) { + ( + Arc { + start: Instant::now(), + cache: Default::default(), + }, + Command::none(), + ) + } + + fn title(&self) -> String { + String::from("Arc - Iced") + } + + fn update(&mut self, _: Message) -> Command { + self.cache.clear(); + + Command::none() + } + + fn subscription(&self) -> Subscription { + iced::time::every(std::time::Duration::from_millis(10)) + .map(|_| Message::Tick) + } + + fn view(&self) -> Element { + Canvas::new(self) + .width(Length::Fill) + .height(Length::Fill) + .into() + } + + fn theme(&self) -> Theme { + Theme::Dark + } +} + +impl canvas::Program for Arc { + type State = (); + + fn draw( + &self, + _state: &Self::State, + theme: &Theme, + bounds: Rectangle, + _cursor: Cursor, + ) -> Vec { + let geometry = self.cache.draw(bounds.size(), |frame| { + let center = frame.center(); + let radius = frame.width().min(frame.height()) / 5.0; + + let start = Point::new(center.x, center.y - radius); + + let angle = (self.start.elapsed().as_millis() % 10_000) as f32 + / 10_000.0 + * 2.0 + * PI; + + let end = Point::new( + center.x + radius * angle.cos(), + center.y + radius * angle.sin(), + ); + + let circles = Path::new(|b| { + b.circle(start, 10.0); + b.move_to(end); + b.circle(end, 10.0); + }); + + frame.fill(&circles, Color::WHITE); + + let path = Path::new(|b| { + b.move_to(start); + b.arc_to(center, end, 50.0); + b.line_to(end); + }); + + let palette = theme.palette(); + + frame.stroke( + &path, + Stroke { + color: palette.text, + width: 10.0, + ..Stroke::default() + }, + ); + }); + + vec![geometry] + } +} -- cgit From 1454bcda4cf37f5d92c6034800eae2fc0aeb88ec Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Sun, 10 Jul 2022 15:18:06 +0200 Subject: Fix `README` or `arc` example --- examples/pure/arc/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'examples/pure') diff --git a/examples/pure/arc/README.md b/examples/pure/arc/README.md index 4cf99efb..303253da 100644 --- a/examples/pure/arc/README.md +++ b/examples/pure/arc/README.md @@ -1,4 +1,4 @@ -## arc_to +## Arc An application that uses the `Canvas` widget to draw a rotating arc. @@ -8,7 +8,7 @@ The __[`main`]__ file contains all the code of the example. You can run it with `cargo run`: ``` -cargo run --package arc_to +cargo run --package arc ``` [`main`]: src/main.rs -- cgit From 3a26a8ccd4c406b4b3f0d5c6d2863d0613798f01 Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Sun, 10 Jul 2022 15:23:51 +0200 Subject: Use `Palette` consistently in `arc` example --- examples/pure/arc/src/main.rs | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'examples/pure') diff --git a/examples/pure/arc/src/main.rs b/examples/pure/arc/src/main.rs index 38b3f502..df0e1e8a 100644 --- a/examples/pure/arc/src/main.rs +++ b/examples/pure/arc/src/main.rs @@ -5,9 +5,7 @@ use iced::pure::widget::canvas::{ self, Cache, Canvas, Cursor, Geometry, Path, Stroke, }; use iced::pure::{Application, Element}; -use iced::{ - Color, Command, Length, Point, Rectangle, Settings, Subscription, Theme, -}; +use iced::{Command, Length, Point, Rectangle, Settings, Subscription, Theme}; pub fn main() -> iced::Result { Arc::run(Settings { @@ -80,6 +78,8 @@ impl canvas::Program for Arc { _cursor: Cursor, ) -> Vec { let geometry = self.cache.draw(bounds.size(), |frame| { + let palette = theme.palette(); + let center = frame.center(); let radius = frame.width().min(frame.height()) / 5.0; @@ -101,7 +101,7 @@ impl canvas::Program for Arc { b.circle(end, 10.0); }); - frame.fill(&circles, Color::WHITE); + frame.fill(&circles, palette.text); let path = Path::new(|b| { b.move_to(start); @@ -109,8 +109,6 @@ impl canvas::Program for Arc { b.line_to(end); }); - let palette = theme.palette(); - frame.stroke( &path, Stroke { -- cgit