me/iced
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Restore canvas::Program API

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2024-03-21 23:30:36 +01:00
parent 3d17cf8790
commit b972ebca8f
No known key found for this signature in database
GPG key ID: 7CC46565708259A7
12 changed files with 71 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

20
examples/bezier_tool/src/main.rs
View file

@ -52,7 +52,9 @@ impl Example {
mod bezier {
use iced::mouse;
use iced::widget::canvas::event::{self, Event};
use iced::widget::canvas::{self, frame, Canvas, Frame, Path, Stroke};
use iced::widget::canvas::{
self, frame, Canvas, Frame, Geometry, Path, Stroke,
};
use iced::{Element, Length, Point, Rectangle, Renderer, Theme};
#[derive(Default)]
@ -138,11 +140,11 @@ mod bezier {
fn draw(
&self,
state: &Self::State,
renderer: &mut Renderer,
renderer: &Renderer,
_theme: &Theme,
bounds: Rectangle,
cursor: mouse::Cursor,
) {
) -> Vec<Geometry> {
let content =
self.state.cache.draw(renderer, bounds.size(), |frame| {
Curve::draw_all(self.curves, frame);
@ -153,10 +155,10 @@ mod bezier {
);
});
renderer.draw_geometry([content]);
if let Some(pending) = state {
pending.draw(renderer, bounds, cursor);
vec![content, pending.draw(renderer, bounds, cursor)]
} else {
vec![content]
}
}
@ -203,10 +205,10 @@ mod bezier {
impl Pending {
fn draw(
&self,
renderer: &mut Renderer,
renderer: &Renderer,
bounds: Rectangle,
cursor: mouse::Cursor,
) {
) -> Geometry {
let mut frame = frame(renderer, bounds.size());
if let Some(cursor_position) = cursor.position_in(bounds) {
@ -227,7 +229,7 @@ mod bezier {
};
}
renderer.draw_geometry([frame]);
frame.into()
}
}
}