Skip to content

Commit 8a05712

Browse files
KeavonKeavon
committed
Reorder tool icons, update favicon and logo, and other icon cleanup
1 parent bd95711 commit 8a05712

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+320
-308
lines changed

‎docs/design/inputs-and-keybindings.md

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -84,15 +84,8 @@ Select Tool | <kbd>V</kbd> | **<kbd>V</kbd>** |
8484
Crop Tool | <kbd> </kbd> | <kbd>C</kbd> | <kbd>Shift</kbd><kbd>O</kbd> | <kbd>A</kbd> | | | |
8585
Navigate Tool | <kbd>Z</kbd> | **<kbd>Z</kbd>**/<kbd>H</kbd>/<kbd>R</kbd> | **<kbd>Z</kbd>**/<kbd>H</kbd> | **<kbd>Z</kbd>** | **<kbd>Z</kbd>**/<kbd>H</kbd> | | |
8686
Eyedropper Tool | <kbd>I</kbd> | **<kbd>I</kbd>** | **<kbd>I</kbd>** | | **<kbd>I</kbd>** | | |
87-
Text Tool | <kbd>T</kbd> | **<kbd>T</kbd>** | **<kbd>T</kbd>** | **<kbd>T</kbd>** | **<kbd>T</kbd>** | | |
8887
Fill Tool | <kbd>F</kbd> | <kbd>G</kbd> | | | <kbd>G</kbd> | | |
8988
Gradient Tool | <kbd>H</kbd> | <kbd>G</kbd> | <kbd>G</kbd> | | <kbd>G</kbd> | | |
90-
Brush Tool | <kbd>B</kbd> | **<kbd>B</kbd>** | **<kbd>B</kbd>** | | **<kbd>B</kbd>** | | |
91-
Heal Tool | <kbd>J</kbd> | **<kbd>J</kbd>** | | | | | |
92-
Clone Tool | <kbd>C</kbd> | <kbd>S</kbd> | | | | | |
93-
Patch Tool | <kbd> </kbd> | <kbd>J</kbd> | | | | | |
94-
Detail Tool | <kbd>D</kbd> | | | | | | |
95-
Relight Tool | <kbd>O</kbd> | **<kbd>O</kbd>** | | | | | |
9689
Path Tool | <kbd>A</kbd> | **<kbd>A</kbd>** | **<kbd>A</kbd>** | | **<kbd>A</kbd>** | | |
9790
Pen Tool | <kbd>P</kbd> | **<kbd>P</kbd>** | **<kbd>P</kbd>** | **<kbd>P</kbd>** | **<kbd>P</kbd>** | | |
9891
Freehand Tool | <kbd>N</kbd> | <kbd>P</kbd> | **<kbd>N</kbd>** | | **<kbd>N</kbd>** | | |
@@ -101,6 +94,13 @@ Line Tool | <kbd>L</kbd> | <kbd>U</kbd> |
10194
Rectangle Tool | <kbd>M</kbd> | <kbd>U</kbd>/**<kbd>M</kbd>** | **<kbd>M</kbd>** | <kbd>R</kbd> | **<kbd>M</kbd>** | | |
10295
Ellipse Tool | <kbd>E</kbd> | <kbd>U</kbd>/<kbd>M</kbd> | <kbd>L</kbd> | **<kbd>E</kbd>** | <kbd>M</kbd> | | |
10396
Shape Tool | <kbd>Y</kbd> | <kbd>U</kbd> | | **<kbd>Y</kbd>** | | | |
97+
Text Tool | <kbd>T</kbd> | **<kbd>T</kbd>** | **<kbd>T</kbd>** | **<kbd>T</kbd>** | **<kbd>T</kbd>** | | |
98+
Brush Tool | <kbd>B</kbd> | **<kbd>B</kbd>** | **<kbd>B</kbd>** | | **<kbd>B</kbd>** | | |
99+
Heal Tool | <kbd>J</kbd> | **<kbd>J</kbd>** | | | | | |
100+
Clone Tool | <kbd>C</kbd> | <kbd>S</kbd> | | | | | |
101+
Patch Tool | <kbd> </kbd> | <kbd>J</kbd> | | | | | |
102+
Relight Tool | <kbd>O</kbd> | **<kbd>O</kbd>** | | | | | |
103+
Detail Tool | <kbd>D</kbd> | | | | | | |
104104

105105
#### Tool-specific keys
106106

@@ -118,24 +118,10 @@ Excluding mouse inputs and modifier keys.
118118

119119
##### Eyedropper Tool
120120

121-
##### Text Tool
122-
123121
##### Fill Tool
124122

125123
##### Gradient Tool
126124

127-
##### Brush Tool
128-
129-
##### Heal Tool
130-
131-
##### Clone Tool
132-
133-
##### Patch Tool
134-
135-
##### Detail Tool
136-
137-
##### Relight Tool
138-
139125
##### Path Tool
140126

141127
##### Pen Tool
@@ -151,3 +137,17 @@ Excluding mouse inputs and modifier keys.
151137
##### Ellipse Tool
152138

153139
##### Shape Tool
140+
141+
##### Text Tool
142+
143+
##### Brush Tool
144+
145+
##### Heal Tool
146+
147+
##### Clone Tool
148+
149+
##### Patch Tool
150+
151+
##### Relight Tool
152+
153+
##### Detail Tool

‎docs/editor/README.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,9 @@ Work in progress.
6565
- Tools
6666
- Overview
6767
- Tools add and update assets
68-
- Layout tool group
69-
- Parametric tool group
70-
- Raster tool group
68+
- General tool group
7169
- Vector tool group
70+
- Raster tool group
7271
- Masking
7372
- Mask mode
7473
- Vector editing

‎editor/src/viewport_tools/tool.rs

Lines changed: 22 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -77,19 +77,15 @@ impl Default for ToolFsmState {
7777
tool_data: ToolData {
7878
active_tool_type: ToolType::Select,
7979
tools: gen_tools_hash_map! {
80+
// General
8081
Select => select_tool::SelectTool,
8182
Crop => crop_tool::CropTool,
8283
Navigate => navigate_tool::NavigateTool,
8384
Eyedropper => eyedropper_tool::EyedropperTool,
84-
Text => text_tool::TextTool,
8585
Fill => fill_tool::FillTool,
8686
Gradient => gradient_tool::GradientTool,
87-
// Brush => brush_tool::BrushTool,
88-
// Heal => heal_tool::HealTool,
89-
// Clone => clone_tool:::CloneTool,
90-
// Patch => patch_tool:::PatchTool,
91-
// BlurSharpen => blursharpen_tool:::BlurSharpenTool,
92-
// Relight => relight_tool:::RelightTool,
87+
88+
// Vector
9389
Path => path_tool::PathTool,
9490
Pen => pen_tool::PenTool,
9591
Freehand => freehand_tool::FreehandTool,
@@ -98,6 +94,15 @@ impl Default for ToolFsmState {
9894
Rectangle => rectangle_tool::RectangleTool,
9995
Ellipse => ellipse_tool::EllipseTool,
10096
Shape => shape_tool::ShapeTool,
97+
Text => text_tool::TextTool,
98+
99+
// Raster
100+
// Brush => brush_tool::BrushTool,
101+
// Heal => heal_tool::HealTool,
102+
// Clone => clone_tool:::CloneTool,
103+
// Patch => patch_tool:::PatchTool,
104+
// Relight => relight_tool:::RelightTool,
105+
// Detail => detail_tool:::DetailTool,
101106
},
102107
},
103108
document_tool_data: DocumentToolData {
@@ -132,7 +137,7 @@ pub enum ToolType {
132137
Heal,
133138
Clone,
134139
Patch,
135-
BlurSharpen,
140+
Detail,
136141
Relight,
137142
Path,
138143
Pen,
@@ -160,7 +165,7 @@ impl fmt::Display for ToolType {
160165
Heal,
161166
Clone,
162167
Patch,
163-
BlurSharpen,
168+
Detail,
164169
Relight,
165170
Path,
166171
Pen,
@@ -193,12 +198,12 @@ pub fn standard_tool_message(tool: ToolType, message_type: StandardToolMessageTy
193198
ToolType::Text => Some(TextMessage::DocumentIsDirty.into()),
194199
ToolType::Fill => None, // Some(FillToolMessage::DocumentIsDirty.into()),
195200
ToolType::Gradient => Some(GradientToolMessage::DocumentIsDirty.into()),
196-
ToolType::Brush => None, // Some(BrushMessage::DocumentIsDirty.into()),
197-
ToolType::Heal => None, // Some(HealMessage::DocumentIsDirty.into()),
198-
ToolType::Clone => None, // Some(CloneMessage::DocumentIsDirty.into()),
199-
ToolType::Patch => None, // Some(PatchMessage::DocumentIsDirty.into()),
200-
ToolType::BlurSharpen => None, // Some(BlurSharPenToolMessage::DocumentIsDirty.into()),
201-
ToolType::Relight => None, // Some(RelightMessage::DocumentIsDirty.into()),
201+
ToolType::Brush => None, // Some(BrushMessage::DocumentIsDirty.into()),
202+
ToolType::Heal => None, // Some(HealMessage::DocumentIsDirty.into()),
203+
ToolType::Clone => None, // Some(CloneMessage::DocumentIsDirty.into()),
204+
ToolType::Patch => None, // Some(PatchMessage::DocumentIsDirty.into()),
205+
ToolType::Detail => None, // Some(DetailToolMessage::DocumentIsDirty.into()),
206+
ToolType::Relight => None, // Some(RelightMessage::DocumentIsDirty.into()),
202207
ToolType::Path => Some(PathToolMessage::DocumentIsDirty.into()),
203208
ToolType::Pen => Some(PenToolMessage::DocumentIsDirty.into()),
204209
ToolType::Freehand => None, // Some(FreehandToolMessage::DocumentIsDirty.into()),
@@ -220,7 +225,7 @@ pub fn standard_tool_message(tool: ToolType, message_type: StandardToolMessageTy
220225
// ToolType::Heal => Some(HealMessage::Abort.into()),
221226
// ToolType::Clone => Some(CloneMessage::Abort.into()),
222227
// ToolType::Patch => Some(PatchMessage::Abort.into()),
223-
// ToolType::BlurSharpen => Some(BlurSharPenToolMessage::Abort.into()),
228+
// ToolType::Detail => Some(DetailToolMessage::Abort.into()),
224229
// ToolType::Relight => Some(RelightMessage::Abort.into()),
225230
ToolType::Path => Some(PathToolMessage::Abort.into()),
226231
ToolType::Pen => Some(PenToolMessage::Abort.into()),
@@ -254,7 +259,7 @@ pub fn message_to_tool_type(message: &ToolMessage) -> ToolType {
254259
// Heal(_) => ToolType::Heal,
255260
// Clone(_) => ToolType::Clone,
256261
// Patch(_) => ToolType::Patch,
257-
// BlurSharpen(_) => ToolType::BlurSharpen,
262+
// Detail(_) => ToolType::Detail,
258263
// Relight(_) => ToolType::Relight,
259264
Path(_) => ToolType::Path,
260265
Pen(_) => ToolType::Pen,

‎editor/src/viewport_tools/tool_message.rs

Lines changed: 21 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -22,36 +22,12 @@ pub enum ToolMessage {
2222
#[remain::unsorted]
2323
#[child]
2424
Eyedropper(EyedropperToolMessage),
25-
// #[remain::unsorted]
26-
// #[child]
27-
// Text(TextMessage),
28-
#[remain::unsorted]
29-
#[child]
30-
Text(TextMessage),
3125
#[remain::unsorted]
3226
#[child]
3327
Fill(FillToolMessage),
3428
#[remain::unsorted]
3529
#[child]
3630
Gradient(GradientToolMessage),
37-
// #[remain::unsorted]
38-
// #[child]
39-
// Brush(BrushToolMessage),
40-
// #[remain::unsorted]
41-
// #[child]
42-
// Heal(HealToolMessage),
43-
// #[remain::unsorted]
44-
// #[child]
45-
// Clone(CloneToolMessage),
46-
// #[remain::unsorted]
47-
// #[child]
48-
// Patch(PatchToolMessage),
49-
// #[remain::unsorted]
50-
// #[child]
51-
// Detail(DetailToolMessage),
52-
// #[remain::unsorted]
53-
// #[child]
54-
// Relight(RelightToolMessage),
5531
#[remain::unsorted]
5632
#[child]
5733
Path(PathToolMessage),
@@ -76,6 +52,27 @@ pub enum ToolMessage {
7652
#[remain::unsorted]
7753
#[child]
7854
Shape(ShapeToolMessage),
55+
#[remain::unsorted]
56+
#[child]
57+
Text(TextMessage),
58+
// #[remain::unsorted]
59+
// #[child]
60+
// Brush(BrushToolMessage),
61+
// #[remain::unsorted]
62+
// #[child]
63+
// Heal(HealToolMessage),
64+
// #[remain::unsorted]
65+
// #[child]
66+
// Clone(CloneToolMessage),
67+
// #[remain::unsorted]
68+
// #[child]
69+
// Patch(PatchToolMessage),
70+
// #[remain::unsorted]
71+
// #[child]
72+
// Relight(RelightToolMessage),
73+
// #[remain::unsorted]
74+
// #[child]
75+
// Detail(DetailToolMessage),
7976

8077
// Messages
8178
#[remain::unsorted]

‎frontend/assets/16px-solid/graphite-logo.svg

Lines changed: 2 additions & 2 deletions
Loading

‎frontend/assets/24px-full-color/node-type-folder.svg

Lines changed: 4 additions & 4 deletions
Loading

‎frontend/assets/24px-full-color/node-type-path.svg

Lines changed: 2 additions & 2 deletions
Loading

‎frontend/assets/24px-two-tone/general-crop-tool.svg

Lines changed: 8 additions & 0 deletions
Loading

‎frontend/assets/24px-two-tone/general-eyedropper-tool.svg

Lines changed: 4 additions & 0 deletions
Loading

‎frontend/assets/24px-two-tone/general-fill-tool.svg

Lines changed: 4 additions & 0 deletions
Loading

0 commit comments

Comments
 (0)