summaryrefslogtreecommitdiffstats
path: root/graphics/src/widget
diff options
context:
space:
mode:
authorLibravatar Héctor Ramón Jiménez <hector0193@gmail.com>2022-07-11 15:53:33 +0200
committerLibravatar Héctor Ramón Jiménez <hector0193@gmail.com>2022-07-11 15:53:33 +0200
commitfe34b7a339261d8fc9a96bf993d529c2ad37299c (patch)
treedc4ce23dd8b1a1c6852c1e36f31289be69fac4bd /graphics/src/widget
parentd1505a98d967f36679f8b7d98347ba03a4c2af1c (diff)
downloadiced-fe34b7a339261d8fc9a96bf993d529c2ad37299c.tar.gz
iced-fe34b7a339261d8fc9a96bf993d529c2ad37299c.tar.bz2
iced-fe34b7a339261d8fc9a96bf993d529c2ad37299c.zip
Update `lyon` to `1.0` :tada:
Congrats and thanks to @nical!
Diffstat (limited to 'graphics/src/widget')
-rw-r--r--graphics/src/widget/canvas/frame.rs2
-rw-r--r--graphics/src/widget/canvas/path.rs11
-rw-r--r--graphics/src/widget/canvas/path/builder.rs2
3 files changed, 7 insertions, 8 deletions
diff --git a/graphics/src/widget/canvas/frame.rs b/graphics/src/widget/canvas/frame.rs
index 8e198b29..0a164fa8 100644
--- a/graphics/src/widget/canvas/frame.rs
+++ b/graphics/src/widget/canvas/frame.rs
@@ -144,7 +144,7 @@ impl Frame {
let _ = self
.fill_tessellator
.tessellate_rectangle(
- &lyon::math::Rect::new(top_left, size.into()),
+ &lyon::math::Box2D::new(top_left, top_left + size),
&options,
&mut buffers,
)
diff --git a/graphics/src/widget/canvas/path.rs b/graphics/src/widget/canvas/path.rs
index f834e286..608507ad 100644
--- a/graphics/src/widget/canvas/path.rs
+++ b/graphics/src/widget/canvas/path.rs
@@ -10,7 +10,7 @@ pub use builder::Builder;
use crate::canvas::LineDash;
use iced_native::{Point, Size};
-use lyon::algorithms::walk::{walk_along_path, RepeatedPattern};
+use lyon::algorithms::walk::{walk_along_path, RepeatedPattern, WalkerEvent};
use lyon::path::iterator::PathIterator;
/// An immutable set of points that may or may not be connected.
@@ -81,13 +81,12 @@ pub(super) fn dashed(path: &Path, line_dash: LineDash<'_>) -> Path {
walk_along_path(
path.raw().iter().flattened(0.01),
0.0,
+ lyon::tessellation::StrokeOptions::DEFAULT_TOLERANCE,
&mut RepeatedPattern {
- callback: |position: lyon::algorithms::math::Point,
- _tangent,
- _distance| {
+ callback: |event: WalkerEvent<'_>| {
let point = Point {
- x: position.x,
- y: position.y,
+ x: event.position.x,
+ y: event.position.y,
};
if draw_line {
diff --git a/graphics/src/widget/canvas/path/builder.rs b/graphics/src/widget/canvas/path/builder.rs
index 88acf544..c49ccdc3 100644
--- a/graphics/src/widget/canvas/path/builder.rs
+++ b/graphics/src/widget/canvas/path/builder.rs
@@ -8,7 +8,7 @@ use lyon::path::builder::SvgPathBuilder;
/// Once a [`Path`] is built, it can no longer be mutated.
#[allow(missing_debug_implementations)]
pub struct Builder {
- raw: lyon::path::builder::WithSvg<lyon::path::path::Builder>,
+ raw: lyon::path::builder::WithSvg<lyon::path::path::BuilderImpl>,
}
impl Builder {