fork/Graphite
1
0
Fork 0
mirror of https://github.com/GraphiteEditor/Graphite.git synced 2026-09-22 02:08:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

All shapes now have a Fill in the properties panel; color inputs are now optional (#583)

Browse Source 
* Add aditional stroke properties

* Make the colour input optional

* Fix fmt

* Apply code review changes

* Code review nitpicks

* Fix recursion

Co-authored-by: Keavon Chambers <keavon@keavon.com>
This commit is contained in:
0HyperCube
2022-04-18 09:25:09 +01:00
committed by Keavon Chambers
co-authored by Keavon Chambers
parent a76bded12f
commit 66a100ff52
7 changed files with 157 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
graphene/src/layers/style/mod.rs
+37 -23
View File
@@ -45,7 +45,7 @@ pub struct Gradient {
pub start: DVec2,
pub end: DVec2,
pub transform: DAffine2,
pub positions: Vec<(f64, Color)>,
pub positions: Vec<(f64, Option<Color>)>,
uuid: u64,
}
impl Gradient {
@@ -54,7 +54,7 @@ impl Gradient {
Gradient {
start,
end,
positions: vec![(0., start_color), (1., end_color)],
positions: vec![(0., Some(start_color)), (1., Some(end_color))],
transform,
uuid,
}
@@ -65,6 +65,7 @@ impl Gradient {
let positions = self
.positions
.iter()
.filter_map(|(pos, color)| color.map(|color| (pos, color)))
.map(|(position, color)| format!(r##"<stop offset="{}" stop-color="#{}" />"##, position, color.rgba_hex()))
.collect::<String>();
@@ -116,7 +117,7 @@ impl Fill {
Self::None => Color::BLACK,
Self::Solid(color) => *color,
// TODO: Should correctly sample the gradient
Self::LinearGradient(Gradient { positions, .. }) => positions[0].1,
Self::LinearGradient(Gradient { positions, .. }) => positions[0].1.unwrap_or(Color::BLACK),
}
}
@@ -179,7 +180,7 @@ impl Display for LineJoin {
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
pub struct Stroke {
/// Stroke color
color: Color,
color: Option<Color>,
/// Line thickness
width: f32,
dash_lengths: Vec<f32>,
@@ -191,11 +192,15 @@ pub struct Stroke {
impl Stroke {
pub fn new(color: Color, width: f32) -> Self {
Self { color, width, ..Default::default() }
Self {
color: Some(color),
width,
..Default::default()
}
}
/// Get the current stroke color.
pub fn color(&self) -> Color {
pub fn color(&self) -> Option<Color> {
self.color
}
@@ -226,24 +231,33 @@ impl Stroke {
/// Provide the SVG attributes for the stroke.
pub fn render(&self) -> String {
format!(
r##" stroke="#{}"{} stroke-width="{}" stroke-dasharray="{}" stroke-dashoffset="{}" stroke-linecap="{}" stroke-linejoin="{}" stroke-miterlimit="{}" "##,
self.color.rgb_hex(),
format_opacity("stroke", self.color.a()),
self.width,
self.dash_lengths(),
self.dash_offset,
self.line_cap,
self.line_join,
self.miter_limit
)
if let Some(color) = self.color {
format!(
r##" stroke="#{}"{} stroke-width="{}" stroke-dasharray="{}" stroke-dashoffset="{}" stroke-linecap="{}" stroke-linejoin="{}" stroke-miterlimit="{}" "##,
color.rgb_hex(),
format_opacity("stroke", color.a()),
self.width,
self.dash_lengths(),
self.dash_offset,
self.line_cap,
self.line_join,
self.miter_limit
)
} else {
String::new()
}
}
pub fn with_color(mut self, color: &str) -> Option<Self> {
Color::from_rgba_str(color).or_else(|| Color::from_rgb_str(color)).map(|color| {
self.color = color;
self
})
pub fn with_color(mut self, color: &Option<String>) -> Option<Self> {
if let Some(color) = color {
Color::from_rgba_str(color).or_else(|| Color::from_rgb_str(color)).map(|color| {
self.color = Some(color);
self
})
} else {
self.color = None;
Some(self)
}
}
pub fn with_width(mut self, width: f32) -> Self {
@@ -290,7 +304,7 @@ impl Default for Stroke {
fn default() -> Self {
Self {
width: 0.,
color: Color::from_rgba8(0, 0, 0, 255),
color: Some(Color::from_rgba8(0, 0, 0, 255)),
dash_lengths: vec![0.],
dash_offset: 0.,
line_cap: LineCap::Butt,