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

Fix shape not closed after using Fill Tool (#510)

Browse Source 
* Always set shape property 'closed' on fill

* Remove closed property on Shape

* Make color mandatory in Fill

* Fix intersection for filled but open shapes

* Code style tweak

* Add TODO note to rework ClosePath check
This commit is contained in:
Paul Kupper
2022-02-06 14:06:23 -08:00
committed by Keavon Chambers
parent 4d232e6b46
commit 3fc517e1c4
10 changed files with 32 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
graphene/src/layers/style/mod.rs
+8 -13
View File
@@ -29,25 +29,21 @@ impl Default for ViewMode {
#[repr(C)]
#[derive(Debug, Clone, Copy, PartialEq, Default, Serialize, Deserialize)]
pub struct Fill {
color: Option<Color>,
color: Color,
}
impl Fill {
pub fn new(color: Color) -> Self {
Self { color: Some(color) }
Self { color }
}
pub fn color(&self) -> Option<Color> {
pub fn color(&self) -> Color {
self.color
}
pub const fn none() -> Self {
Self { color: None }
}
pub fn render(&self) -> String {
match self.color {
Some(c) => format!(r##" fill="#{}"{}"##, c.rgb_hex(), format_opacity("fill", c.a())),
pub fn render(fill: Option<Fill>) -> String {
match fill {
Some(c) => format!(r##" fill="#{}"{}"##, c.color.rgb_hex(), format_opacity("fill", c.color.a())),
None => r#" fill="none""#.to_string(),
}
}
@@ -116,9 +112,8 @@ impl PathStyle {
pub fn render(&self, view_mode: ViewMode) -> String {
let fill_attribute = match (view_mode, self.fill) {
(ViewMode::Outline, _) => Fill::none().render(),
(_, Some(fill)) => fill.render(),
(_, None) => String::new(),
(ViewMode::Outline, _) => Fill::render(None),
(_, fill) => Fill::render(fill),
};
let stroke_attribute = match (view_mode, self.stroke) {
(ViewMode::Outline, _) => Stroke::new(LAYER_OUTLINE_STROKE_COLOR, LAYER_OUTLINE_STROKE_WIDTH).render(),