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

Add shape side selection with JSON deserialization

Browse Source
This commit is contained in:
Henry Sloan
2021-07-20 18:18:56 -04:00
parent 8ea6fd8d6a
commit 2fe1d60086
6 changed files with 28 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/editor/src/tool/mod.rs
View File

@@ -179,7 +179,7 @@ impl ToolType {
ToolType::Select => ToolSettings::Select { append_mode: SelectAppendMode::New },
ToolType::Ellipse => ToolSettings::Ellipse,
ToolType::Shape => ToolSettings::Shape {
shape: Shape::Polygon { vertices: 3 },
shape_type: ShapeType::Polygon { vertices: 6 },
},
_ => todo!(),
}

12
core/editor/src/tool/tool_settings.rs
View File

@@ -1,11 +1,13 @@
#[derive(Debug, Clone, Copy, Eq, PartialEq)]
use serde::{Deserialize, Serialize};
#[derive(Debug, Clone, Copy, Eq, PartialEq, Serialize, Deserialize)]
pub enum ToolSettings {
Select { append_mode: SelectAppendMode },
Ellipse,
Shape { shape: Shape },
Shape { shape_type: ShapeType },
}
#[derive(Debug, Clone, Copy, Eq, PartialEq)]
#[derive(Debug, Clone, Copy, Eq, PartialEq, Serialize, Deserialize)]
pub enum SelectAppendMode {
New,
Add,
@@ -13,8 +15,8 @@ pub enum SelectAppendMode {
Intersect,
}
#[derive(Debug, Clone, Copy, Eq, PartialEq)]
pub enum Shape {
#[derive(Debug, Clone, Copy, Eq, PartialEq, Serialize, Deserialize)]
pub enum ShapeType {
Star { vertices: u32 },
Polygon { vertices: u32 },
}

16
core/editor/src/tool/tools/shape.rs
View File

@@ -1,5 +1,5 @@
use crate::input::{mouse::ViewportPosition, InputPreprocessor};
use crate::tool::{DocumentToolData, Fsm, ToolActionHandlerData};
use crate::tool::{DocumentToolData, Fsm, ShapeType, ToolActionHandlerData, ToolSettings, ToolType};
use crate::{document::Document, message_prelude::*};
use document_core::{layers::style, Operation};
use glam::{DAffine2, DVec2};
@@ -70,13 +70,13 @@ impl Fsm for ShapeToolFsmState {
data.drag_start = input.mouse.position;
data.drag_current = input.mouse.position;
data.sides = 6;
if let Some(tool_settings) = tool_data.tool_settings.get(&crate::tool::ToolType::Shape) {
if let crate::tool::ToolSettings::Shape { shape } = tool_settings {
if let crate::tool::Shape::Polygon { vertices } = shape {
data.sides = *vertices as u8;
}
}
data.sides = if let Some(&ToolSettings::Shape {
shape_type: ShapeType::Polygon { vertices },
}) = tool_data.tool_settings.get(&ToolType::Shape)
{
vertices as u8
} else {
6
};
responses.push_back(Operation::MountWorkingFolder { path: vec![] }.into());