diff --git a/docs/design/inputs-and-keybindings.md b/docs/design/inputs-and-keybindings.md
index 85fc7316..1d1e340a 100644
--- a/docs/design/inputs-and-keybindings.md
+++ b/docs/design/inputs-and-keybindings.md
@@ -84,15 +84,8 @@ Select Tool | V | **V** |
Crop Tool | | C | ShiftO | A | | | |
Navigate Tool | Z | **Z**/H/R | **Z**/H | **Z** | **Z**/H | | |
Eyedropper Tool | I | **I** | **I** | | **I** | | |
-Text Tool | T | **T** | **T** | **T** | **T** | | |
Fill Tool | F | G | | | G | | |
Gradient Tool | H | G | G | | G | | |
-Brush Tool | B | **B** | **B** | | **B** | | |
-Heal Tool | J | **J** | | | | | |
-Clone Tool | C | S | | | | | |
-Patch Tool | | J | | | | | |
-Detail Tool | D | | | | | | |
-Relight Tool | O | **O** | | | | | |
Path Tool | A | **A** | **A** | | **A** | | |
Pen Tool | P | **P** | **P** | **P** | **P** | | |
Freehand Tool | N | P | **N** | | **N** | | |
@@ -101,6 +94,13 @@ Line Tool | L | U |
Rectangle Tool | M | U/**M** | **M** | R | **M** | | |
Ellipse Tool | E | U/M | L | **E** | M | | |
Shape Tool | Y | U | | **Y** | | | |
+Text Tool | T | **T** | **T** | **T** | **T** | | |
+Brush Tool | B | **B** | **B** | | **B** | | |
+Heal Tool | J | **J** | | | | | |
+Clone Tool | C | S | | | | | |
+Patch Tool | | J | | | | | |
+Relight Tool | O | **O** | | | | | |
+Detail Tool | D | | | | | | |
#### Tool-specific keys
@@ -118,24 +118,10 @@ Excluding mouse inputs and modifier keys.
##### Eyedropper Tool
-##### Text Tool
-
##### Fill Tool
##### Gradient Tool
-##### Brush Tool
-
-##### Heal Tool
-
-##### Clone Tool
-
-##### Patch Tool
-
-##### Detail Tool
-
-##### Relight Tool
-
##### Path Tool
##### Pen Tool
@@ -151,3 +137,17 @@ Excluding mouse inputs and modifier keys.
##### Ellipse Tool
##### Shape Tool
+
+##### Text Tool
+
+##### Brush Tool
+
+##### Heal Tool
+
+##### Clone Tool
+
+##### Patch Tool
+
+##### Relight Tool
+
+##### Detail Tool
diff --git a/docs/editor/README.md b/docs/editor/README.md
index b587f102..01c22ae6 100644
--- a/docs/editor/README.md
+++ b/docs/editor/README.md
@@ -65,10 +65,9 @@ Work in progress.
- Tools
- Overview
- Tools add and update assets
- - Layout tool group
- - Parametric tool group
- - Raster tool group
+ - General tool group
- Vector tool group
+ - Raster tool group
- Masking
- Mask mode
- Vector editing
diff --git a/editor/src/viewport_tools/tool.rs b/editor/src/viewport_tools/tool.rs
index a7e98151..27db894a 100644
--- a/editor/src/viewport_tools/tool.rs
+++ b/editor/src/viewport_tools/tool.rs
@@ -77,19 +77,15 @@ impl Default for ToolFsmState {
tool_data: ToolData {
active_tool_type: ToolType::Select,
tools: gen_tools_hash_map! {
+ // General
Select => select_tool::SelectTool,
Crop => crop_tool::CropTool,
Navigate => navigate_tool::NavigateTool,
Eyedropper => eyedropper_tool::EyedropperTool,
- Text => text_tool::TextTool,
Fill => fill_tool::FillTool,
Gradient => gradient_tool::GradientTool,
- // Brush => brush_tool::BrushTool,
- // Heal => heal_tool::HealTool,
- // Clone => clone_tool:::CloneTool,
- // Patch => patch_tool:::PatchTool,
- // BlurSharpen => blursharpen_tool:::BlurSharpenTool,
- // Relight => relight_tool:::RelightTool,
+
+ // Vector
Path => path_tool::PathTool,
Pen => pen_tool::PenTool,
Freehand => freehand_tool::FreehandTool,
@@ -98,6 +94,15 @@ impl Default for ToolFsmState {
Rectangle => rectangle_tool::RectangleTool,
Ellipse => ellipse_tool::EllipseTool,
Shape => shape_tool::ShapeTool,
+ Text => text_tool::TextTool,
+
+ // Raster
+ // Brush => brush_tool::BrushTool,
+ // Heal => heal_tool::HealTool,
+ // Clone => clone_tool:::CloneTool,
+ // Patch => patch_tool:::PatchTool,
+ // Relight => relight_tool:::RelightTool,
+ // Detail => detail_tool:::DetailTool,
},
},
document_tool_data: DocumentToolData {
@@ -132,7 +137,7 @@ pub enum ToolType {
Heal,
Clone,
Patch,
- BlurSharpen,
+ Detail,
Relight,
Path,
Pen,
@@ -160,7 +165,7 @@ impl fmt::Display for ToolType {
Heal,
Clone,
Patch,
- BlurSharpen,
+ Detail,
Relight,
Path,
Pen,
@@ -193,12 +198,12 @@ pub fn standard_tool_message(tool: ToolType, message_type: StandardToolMessageTy
ToolType::Text => Some(TextMessage::DocumentIsDirty.into()),
ToolType::Fill => None, // Some(FillToolMessage::DocumentIsDirty.into()),
ToolType::Gradient => Some(GradientToolMessage::DocumentIsDirty.into()),
- ToolType::Brush => None, // Some(BrushMessage::DocumentIsDirty.into()),
- ToolType::Heal => None, // Some(HealMessage::DocumentIsDirty.into()),
- ToolType::Clone => None, // Some(CloneMessage::DocumentIsDirty.into()),
- ToolType::Patch => None, // Some(PatchMessage::DocumentIsDirty.into()),
- ToolType::BlurSharpen => None, // Some(BlurSharPenToolMessage::DocumentIsDirty.into()),
- ToolType::Relight => None, // Some(RelightMessage::DocumentIsDirty.into()),
+ ToolType::Brush => None, // Some(BrushMessage::DocumentIsDirty.into()),
+ ToolType::Heal => None, // Some(HealMessage::DocumentIsDirty.into()),
+ ToolType::Clone => None, // Some(CloneMessage::DocumentIsDirty.into()),
+ ToolType::Patch => None, // Some(PatchMessage::DocumentIsDirty.into()),
+ ToolType::Detail => None, // Some(DetailToolMessage::DocumentIsDirty.into()),
+ ToolType::Relight => None, // Some(RelightMessage::DocumentIsDirty.into()),
ToolType::Path => Some(PathToolMessage::DocumentIsDirty.into()),
ToolType::Pen => Some(PenToolMessage::DocumentIsDirty.into()),
ToolType::Freehand => None, // Some(FreehandToolMessage::DocumentIsDirty.into()),
@@ -220,7 +225,7 @@ pub fn standard_tool_message(tool: ToolType, message_type: StandardToolMessageTy
// ToolType::Heal => Some(HealMessage::Abort.into()),
// ToolType::Clone => Some(CloneMessage::Abort.into()),
// ToolType::Patch => Some(PatchMessage::Abort.into()),
- // ToolType::BlurSharpen => Some(BlurSharPenToolMessage::Abort.into()),
+ // ToolType::Detail => Some(DetailToolMessage::Abort.into()),
// ToolType::Relight => Some(RelightMessage::Abort.into()),
ToolType::Path => Some(PathToolMessage::Abort.into()),
ToolType::Pen => Some(PenToolMessage::Abort.into()),
@@ -254,7 +259,7 @@ pub fn message_to_tool_type(message: &ToolMessage) -> ToolType {
// Heal(_) => ToolType::Heal,
// Clone(_) => ToolType::Clone,
// Patch(_) => ToolType::Patch,
- // BlurSharpen(_) => ToolType::BlurSharpen,
+ // Detail(_) => ToolType::Detail,
// Relight(_) => ToolType::Relight,
Path(_) => ToolType::Path,
Pen(_) => ToolType::Pen,
diff --git a/editor/src/viewport_tools/tool_message.rs b/editor/src/viewport_tools/tool_message.rs
index 87e93144..9fe6f78b 100644
--- a/editor/src/viewport_tools/tool_message.rs
+++ b/editor/src/viewport_tools/tool_message.rs
@@ -22,36 +22,12 @@ pub enum ToolMessage {
#[remain::unsorted]
#[child]
Eyedropper(EyedropperToolMessage),
- // #[remain::unsorted]
- // #[child]
- // Text(TextMessage),
- #[remain::unsorted]
- #[child]
- Text(TextMessage),
#[remain::unsorted]
#[child]
Fill(FillToolMessage),
#[remain::unsorted]
#[child]
Gradient(GradientToolMessage),
- // #[remain::unsorted]
- // #[child]
- // Brush(BrushToolMessage),
- // #[remain::unsorted]
- // #[child]
- // Heal(HealToolMessage),
- // #[remain::unsorted]
- // #[child]
- // Clone(CloneToolMessage),
- // #[remain::unsorted]
- // #[child]
- // Patch(PatchToolMessage),
- // #[remain::unsorted]
- // #[child]
- // Detail(DetailToolMessage),
- // #[remain::unsorted]
- // #[child]
- // Relight(RelightToolMessage),
#[remain::unsorted]
#[child]
Path(PathToolMessage),
@@ -76,6 +52,27 @@ pub enum ToolMessage {
#[remain::unsorted]
#[child]
Shape(ShapeToolMessage),
+ #[remain::unsorted]
+ #[child]
+ Text(TextMessage),
+ // #[remain::unsorted]
+ // #[child]
+ // Brush(BrushToolMessage),
+ // #[remain::unsorted]
+ // #[child]
+ // Heal(HealToolMessage),
+ // #[remain::unsorted]
+ // #[child]
+ // Clone(CloneToolMessage),
+ // #[remain::unsorted]
+ // #[child]
+ // Patch(PatchToolMessage),
+ // #[remain::unsorted]
+ // #[child]
+ // Relight(RelightToolMessage),
+ // #[remain::unsorted]
+ // #[child]
+ // Detail(DetailToolMessage),
// Messages
#[remain::unsorted]
diff --git a/frontend/assets/16px-solid/graphite-logo.svg b/frontend/assets/16px-solid/graphite-logo.svg
index 9f766aa7..477fca57 100644
--- a/frontend/assets/16px-solid/graphite-logo.svg
+++ b/frontend/assets/16px-solid/graphite-logo.svg
@@ -1,3 +1,3 @@
\ No newline at end of file
+
+
diff --git a/frontend/assets/24px-full-color/node-type-folder.svg b/frontend/assets/24px-full-color/node-type-folder.svg
index 3cba18f4..c7eb74aa 100644
--- a/frontend/assets/24px-full-color/node-type-folder.svg
+++ b/frontend/assets/24px-full-color/node-type-folder.svg
@@ -1,11 +1,11 @@