Ask for a slice of segments instead of ownership in LineDash
This commit is contained in:
parent
76c03de587
commit
f56c8a7361
5 changed files with 26 additions and 26 deletions
|
|
@ -100,14 +100,14 @@ impl canvas::Program<Message> for Clock {
|
||||||
|
|
||||||
let wide_stroke = Stroke {
|
let wide_stroke = Stroke {
|
||||||
width: thin_stroke.width * 3.0,
|
width: thin_stroke.width * 3.0,
|
||||||
..thin_stroke.clone()
|
..thin_stroke
|
||||||
};
|
};
|
||||||
|
|
||||||
frame.translate(Vector::new(center.x, center.y));
|
frame.translate(Vector::new(center.x, center.y));
|
||||||
|
|
||||||
frame.with_save(|frame| {
|
frame.with_save(|frame| {
|
||||||
frame.rotate(hand_rotation(self.now.hour(), 12));
|
frame.rotate(hand_rotation(self.now.hour(), 12));
|
||||||
frame.stroke(&short_hand, wide_stroke.clone());
|
frame.stroke(&short_hand, wide_stroke);
|
||||||
});
|
});
|
||||||
|
|
||||||
frame.with_save(|frame| {
|
frame.with_save(|frame| {
|
||||||
|
|
|
||||||
|
|
@ -165,7 +165,7 @@ impl<Message> canvas::Program<Message> for State {
|
||||||
color: Color::from_rgba8(0, 153, 255, 0.1),
|
color: Color::from_rgba8(0, 153, 255, 0.1),
|
||||||
line_dash: canvas::LineDash {
|
line_dash: canvas::LineDash {
|
||||||
offset: 0,
|
offset: 0,
|
||||||
segments: vec![3.0, 6.0],
|
segments: &[3.0, 6.0],
|
||||||
},
|
},
|
||||||
..Stroke::default()
|
..Stroke::default()
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -153,7 +153,7 @@ impl Frame {
|
||||||
|
|
||||||
/// Draws the stroke of the given [`Path`] on the [`Frame`] with the
|
/// Draws the stroke of the given [`Path`] on the [`Frame`] with the
|
||||||
/// provided style.
|
/// provided style.
|
||||||
pub fn stroke(&mut self, path: &Path, stroke: impl Into<Stroke>) {
|
pub fn stroke<'a>(&mut self, path: &Path, stroke: impl Into<Stroke<'a>>) {
|
||||||
let stroke = stroke.into();
|
let stroke = stroke.into();
|
||||||
|
|
||||||
let mut buffers = tessellation::BuffersBuilder::new(
|
let mut buffers = tessellation::BuffersBuilder::new(
|
||||||
|
|
|
||||||
|
|
@ -71,15 +71,11 @@ impl Path {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub(super) fn dashed(path: &Path, line_dash: LineDash) -> Path {
|
pub(super) fn dashed(path: &Path, line_dash: LineDash<'_>) -> Path {
|
||||||
Path::new(|builder| {
|
Path::new(|builder| {
|
||||||
let segments_odd = line_dash.segments.len() % 2 == 1;
|
let segments_odd = (line_dash.segments.len() % 2 == 1).then(|| {
|
||||||
|
[&line_dash.segments[..], &line_dash.segments[..]].concat()
|
||||||
let segments = segments_odd
|
});
|
||||||
.then(|| {
|
|
||||||
[&line_dash.segments[..], &line_dash.segments[..]].concat()
|
|
||||||
})
|
|
||||||
.unwrap_or(line_dash.segments);
|
|
||||||
|
|
||||||
let mut draw_line = false;
|
let mut draw_line = false;
|
||||||
|
|
||||||
|
|
@ -106,7 +102,10 @@ pub(super) fn dashed(path: &Path, line_dash: LineDash) -> Path {
|
||||||
true
|
true
|
||||||
},
|
},
|
||||||
index: line_dash.offset,
|
index: line_dash.offset,
|
||||||
intervals: &segments,
|
intervals: segments_odd
|
||||||
|
.as_ref()
|
||||||
|
.map(Vec::as_slice)
|
||||||
|
.unwrap_or(line_dash.segments),
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
})
|
})
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,8 @@
|
||||||
use iced_native::Color;
|
use iced_native::Color;
|
||||||
|
|
||||||
/// The style of a stroke.
|
/// The style of a stroke.
|
||||||
#[derive(Debug, Clone)]
|
#[derive(Debug, Clone, Copy)]
|
||||||
pub struct Stroke {
|
pub struct Stroke<'a> {
|
||||||
/// The color of the stroke.
|
/// The color of the stroke.
|
||||||
pub color: Color,
|
pub color: Color,
|
||||||
/// The distance between the two edges of the stroke.
|
/// The distance between the two edges of the stroke.
|
||||||
|
|
@ -13,33 +13,33 @@ pub struct Stroke {
|
||||||
/// are stroked.
|
/// are stroked.
|
||||||
pub line_join: LineJoin,
|
pub line_join: LineJoin,
|
||||||
/// The dash pattern used when stroking the line.
|
/// The dash pattern used when stroking the line.
|
||||||
pub line_dash: LineDash,
|
pub line_dash: LineDash<'a>,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Stroke {
|
impl<'a> Stroke<'a> {
|
||||||
/// Sets the color of the [`Stroke`].
|
/// Sets the color of the [`Stroke`].
|
||||||
pub fn with_color(self, color: Color) -> Stroke {
|
pub fn with_color(self, color: Color) -> Self {
|
||||||
Stroke { color, ..self }
|
Stroke { color, ..self }
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Sets the width of the [`Stroke`].
|
/// Sets the width of the [`Stroke`].
|
||||||
pub fn with_width(self, width: f32) -> Stroke {
|
pub fn with_width(self, width: f32) -> Self {
|
||||||
Stroke { width, ..self }
|
Stroke { width, ..self }
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Sets the [`LineCap`] of the [`Stroke`].
|
/// Sets the [`LineCap`] of the [`Stroke`].
|
||||||
pub fn with_line_cap(self, line_cap: LineCap) -> Stroke {
|
pub fn with_line_cap(self, line_cap: LineCap) -> Self {
|
||||||
Stroke { line_cap, ..self }
|
Stroke { line_cap, ..self }
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Sets the [`LineJoin`] of the [`Stroke`].
|
/// Sets the [`LineJoin`] of the [`Stroke`].
|
||||||
pub fn with_line_join(self, line_join: LineJoin) -> Stroke {
|
pub fn with_line_join(self, line_join: LineJoin) -> Self {
|
||||||
Stroke { line_join, ..self }
|
Stroke { line_join, ..self }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Default for Stroke {
|
impl<'a> Default for Stroke<'a> {
|
||||||
fn default() -> Stroke {
|
fn default() -> Self {
|
||||||
Stroke {
|
Stroke {
|
||||||
color: Color::BLACK,
|
color: Color::BLACK,
|
||||||
width: 1.0,
|
width: 1.0,
|
||||||
|
|
@ -108,10 +108,11 @@ impl From<LineJoin> for lyon::tessellation::LineJoin {
|
||||||
}
|
}
|
||||||
|
|
||||||
/// The dash pattern used when stroking the line.
|
/// The dash pattern used when stroking the line.
|
||||||
#[derive(Debug, Clone, Default)]
|
#[derive(Debug, Clone, Copy, Default)]
|
||||||
pub struct LineDash {
|
pub struct LineDash<'a> {
|
||||||
/// The alternating lengths of lines and gaps which describe the pattern.
|
/// The alternating lengths of lines and gaps which describe the pattern.
|
||||||
pub segments: Vec<f32>,
|
pub segments: &'a [f32],
|
||||||
|
|
||||||
/// The offset of [`LineDash::segments`] to start the pattern.
|
/// The offset of [`LineDash::segments`] to start the pattern.
|
||||||
pub offset: usize,
|
pub offset: usize,
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue