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

Fix sorting of message enum variants

Browse Source
This commit is contained in:
Keavon Chambers
2022-01-16 13:59:55 -08:00
parent 1a4ab0733b
commit 841f34e797
25 changed files with 254 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files
editor/src/viewport_tools/tool_message.rs
+38 -23
View File
@@ -10,32 +10,49 @@ use serde::{Deserialize, Serialize};
#[impl_message(Message, Tool)]
#[derive(PartialEq, Clone, Debug, Serialize, Deserialize)]
pub enum ToolMessage {
// Sub-messages
#[remain::unsorted]
#[child]
Crop(CropMessage),
#[remain::unsorted]
#[child]
Ellipse(EllipseMessage),
#[remain::unsorted]
#[child]
Eyedropper(EyedropperMessage),
#[remain::unsorted]
#[child]
Fill(FillMessage),
#[remain::unsorted]
#[child]
Line(LineMessage),
#[remain::unsorted]
#[child]
Navigate(NavigateMessage),
#[remain::unsorted]
#[child]
Path(PathMessage),
#[remain::unsorted]
#[child]
Pen(PenMessage),
#[remain::unsorted]
#[child]
Rectangle(RectangleMessage),
#[remain::unsorted]
#[child]
Select(SelectMessage),
#[remain::unsorted]
#[child]
Shape(ShapeMessage),
// Messages
#[remain::unsorted]
NoOp,
ActivateTool {
tool_type: ToolType,
},
#[child]
Crop(CropMessage),
DocumentIsDirty,
#[child]
Ellipse(EllipseMessage),
#[child]
Eyedropper(EyedropperMessage),
#[child]
Fill(FillMessage),
#[child]
Line(LineMessage),
#[child]
Navigate(NavigateMessage),
NoOp,
#[child]
Path(PathMessage),
#[child]
Pen(PenMessage),
#[child]
Rectangle(RectangleMessage),
ResetColors,
#[child]
Select(SelectMessage),
SelectPrimaryColor {
color: Color,
},
@@ -46,8 +63,6 @@ pub enum ToolMessage {
tool_type: ToolType,
tool_options: ToolOptions,
},
#[child]
Shape(ShapeMessage),
SwapColors,
UpdateCursor,
UpdateHints,
editor/src/viewport_tools/tool_message_handler.rs
+4
View File
@@ -20,6 +20,7 @@ impl MessageHandler<ToolMessage, (&DocumentMessageHandler, &InputPreprocessorMes
let (document, input) = data;
#[remain::sorted]
match message {
// Messages
ActivateTool { tool_type } => {
let tool_data = &mut self.tool_state.tool_data;
let document_data = &self.tool_state.document_tool_data;
@@ -101,6 +102,9 @@ impl MessageHandler<ToolMessage, (&DocumentMessageHandler, &InputPreprocessorMes
update_working_colors(document_data, responses);
}
// Sub-messages
#[remain::unsorted]
tool_message => {
let tool_type = match &tool_message {
UpdateCursor | UpdateHints => self.tool_state.tool_data.active_tool_type,
editor/src/viewport_tools/tools/crop.rs
+5
View File
@@ -10,6 +10,11 @@ pub struct Crop;
#[impl_message(Message, ToolMessage, Crop)]
#[derive(PartialEq, Clone, Debug, Hash, Serialize, Deserialize)]
pub enum CropMessage {
// Standard messages
// #[remain::unsorted]
// Abort,
// Tool-specific messages
MouseMove,
}
editor/src/viewport_tools/tools/ellipse.rs
+8 -1
View File
@@ -23,10 +23,17 @@ pub struct Ellipse {
#[impl_message(Message, ToolMessage, Ellipse)]
#[derive(PartialEq, Clone, Debug, Hash, Serialize, Deserialize)]
pub enum EllipseMessage {
// Standard messages
#[remain::unsorted]
Abort,
// Tool-specific messages
DragStart,
DragStop,
Resize { center: Key, lock_ratio: Key },
Resize {
center: Key,
lock_ratio: Key,
},
}
impl<'a> MessageHandler<ToolMessage, ToolActionHandlerData<'a>> for Ellipse {
editor/src/viewport_tools/tools/eyedropper.rs
+4
View File
@@ -23,7 +23,11 @@ pub struct Eyedropper {
#[impl_message(Message, ToolMessage, Eyedropper)]
#[derive(PartialEq, Clone, Debug, Hash, Serialize, Deserialize)]
pub enum EyedropperMessage {
// Standard messages
#[remain::unsorted]
Abort,
// Tool-specific messages
LeftMouseDown,
RightMouseDown,
}
editor/src/viewport_tools/tools/fill.rs
+4
View File
@@ -23,7 +23,11 @@ pub struct Fill {
#[impl_message(Message, ToolMessage, Fill)]
#[derive(PartialEq, Clone, Debug, Hash, Serialize, Deserialize)]
pub enum FillMessage {
// Standard messages
#[remain::unsorted]
Abort,
// Tool-specific messages
LeftMouseDown,
RightMouseDown,
}
editor/src/viewport_tools/tools/line.rs
+9 -1
View File
@@ -26,10 +26,18 @@ pub struct Line {
#[impl_message(Message, ToolMessage, Line)]
#[derive(PartialEq, Clone, Debug, Hash, Serialize, Deserialize)]
pub enum LineMessage {
// Standard messages
#[remain::unsorted]
Abort,
// Tool-specific messages
DragStart,
DragStop,
Redraw { center: Key, lock_angle: Key, snap_angle: Key },
Redraw {
center: Key,
lock_angle: Key,
snap_angle: Key,
},
}
impl<'a> MessageHandler<ToolMessage, ToolActionHandlerData<'a>> for Line {
editor/src/viewport_tools/tools/navigate.rs
+11 -2
View File
@@ -19,9 +19,18 @@ pub struct Navigate {
#[impl_message(Message, ToolMessage, Navigate)]
#[derive(PartialEq, Clone, Debug, Hash, Serialize, Deserialize)]
pub enum NavigateMessage {
// Standard messages
#[remain::unsorted]
Abort,
ClickZoom { zoom_in: bool },
MouseMove { snap_angle: Key, snap_zoom: Key },
// Tool-specific messages
ClickZoom {
zoom_in: bool,
},
MouseMove {
snap_angle: Key,
snap_zoom: Key,
},
RotateCanvasBegin,
TransformCanvasEnd,
TranslateCanvasBegin,
editor/src/viewport_tools/tools/path.rs
+3
View File
@@ -27,9 +27,12 @@ pub struct Path {
#[derive(PartialEq, Clone, Debug, Hash, Serialize, Deserialize)]
pub enum PathMessage {
// Standard messages
#[remain::unsorted]
Abort,
#[remain::unsorted]
DocumentIsDirty,
// Tool-specific messages
DragStart,
DragStop,
PointerMove,
editor/src/viewport_tools/tools/pen.rs
+4
View File
@@ -24,7 +24,11 @@ pub struct Pen {
#[impl_message(Message, ToolMessage, Pen)]
#[derive(PartialEq, Clone, Debug, Hash, Serialize, Deserialize)]
pub enum PenMessage {
// Standard messages
#[remain::unsorted]
Abort,
// Tool-specific messages
Confirm,
DragStart,
DragStop,
editor/src/viewport_tools/tools/rectangle.rs
+8 -1
View File
@@ -23,10 +23,17 @@ pub struct Rectangle {
#[impl_message(Message, ToolMessage, Rectangle)]
#[derive(PartialEq, Clone, Debug, Hash, Serialize, Deserialize)]
pub enum RectangleMessage {
// Standard messages
#[remain::unsorted]
Abort,
// Tool-specific messages
DragStart,
DragStop,
Resize { center: Key, lock_ratio: Key },
Resize {
center: Key,
lock_ratio: Key,
},
}
impl<'a> MessageHandler<ToolMessage, ToolActionHandlerData<'a>> for Rectangle {
editor/src/viewport_tools/tools/select.rs
+14 -5
View File
@@ -24,21 +24,30 @@ pub struct Select {
data: SelectToolData,
}
// #[remain::sorted] // https://github.com/dtolnay/remain/issues/16
#[remain::sorted]
#[impl_message(Message, ToolMessage, Select)]
#[derive(PartialEq, Clone, Debug, Hash, Serialize, Deserialize)]
pub enum SelectMessage {
// Standard messages
#[remain::unsorted]
Abort,
#[remain::unsorted]
DocumentIsDirty,
DragStart { add_to_selection: Key },
// Tool-specific messages
Align {
axis: AlignAxis,
aggregate: AlignAggregate,
},
DragStart {
add_to_selection: Key,
},
DragStop,
MouseMove { snap_angle: Key },
Align { axis: AlignAxis, aggregate: AlignAggregate },
FlipHorizontal,
FlipVertical,
MouseMove {
snap_angle: Key,
},
}
impl<'a> MessageHandler<ToolMessage, ToolActionHandlerData<'a>> for Select {
editor/src/viewport_tools/tools/shape.rs
+8 -1
View File
@@ -24,10 +24,17 @@ pub struct Shape {
#[impl_message(Message, ToolMessage, Shape)]
#[derive(PartialEq, Clone, Debug, Hash, Serialize, Deserialize)]
pub enum ShapeMessage {
// Standard messages
#[remain::unsorted]
Abort,
// Tool-specific messages
DragStart,
DragStop,
Resize { center: Key, lock_ratio: Key },
Resize {
center: Key,
lock_ratio: Key,
},
}
impl<'a> MessageHandler<ToolMessage, ToolActionHandlerData<'a>> for Shape {