fork/Graphite
1
0
Fork 0
mirror of https://github.com/GraphiteEditor/Graphite.git synced 2026-09-23 01:18:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Replace responses.push() with responses.add() everywhere (#1186)

Browse Source
This commit is contained in:
Keavon Chambers
2023-04-27 17:25:19 -07:00
committed by GitHub
parent dc8c013e22
commit fce81d0dfc
49 changed files with 1068 additions and 1385 deletions
Download Patch File Download Diff File Expand all files Collapse all files
editor/src/messages/tool/common_functionality/graph_modification_utils.rs
+7 -10
View File
@@ -17,16 +17,13 @@ pub fn new_vector_layer(subpaths: Vec<Subpath<ManipulatorGroupId>>, layer_path:
}
pub fn new_custom_layer(network: NodeNetwork, layer_path: Vec<LayerId>, responses: &mut VecDeque<Message>) {
responses.push_back(DocumentMessage::DeselectAllLayers.into());
responses.push_back(
Operation::AddNodeGraphFrame {
path: layer_path.clone(),
insert_index: -1,
transform: DAffine2::ZERO.to_cols_array(),
network,
}
.into(),
);
responses.add(DocumentMessage::DeselectAllLayers);
responses.add(Operation::AddNodeGraphFrame {
path: layer_path.clone(),
insert_index: -1,
transform: DAffine2::ZERO.to_cols_array(),
network,
});
responses.add(DocumentMessage::NodeGraphFrameGenerate { layer_path });
}
editor/src/messages/tool/common_functionality/overlay_renderer.rs
+15 -15
View File
@@ -163,7 +163,7 @@ impl OverlayRenderer {
insert_index: -1,
transform: DAffine2::IDENTITY.to_cols_array(),
};
responses.push_back(DocumentMessage::Overlays(operation.into()).into());
responses.add(DocumentMessage::Overlays(operation.into()));
layer_path
}
@@ -177,7 +177,7 @@ impl OverlayRenderer {
style: style::PathStyle::new(Some(Stroke::new(COLOR_ACCENT, 2.0)), Fill::solid(Color::WHITE)),
insert_index: -1,
};
responses.push_back(DocumentMessage::Overlays(operation.into()).into());
responses.add(DocumentMessage::Overlays(operation.into()));
layer_path
}
@@ -190,7 +190,7 @@ impl OverlayRenderer {
style: style::PathStyle::new(Some(Stroke::new(COLOR_ACCENT, 2.0)), Fill::solid(Color::WHITE)),
insert_index: -1,
};
responses.push_back(DocumentMessage::Overlays(operation.into()).into());
responses.add(DocumentMessage::Overlays(operation.into()));
layer_path
}
@@ -202,7 +202,7 @@ impl OverlayRenderer {
/// Remove an overlay at the specified path
fn remove_overlay(path: Option<Vec<LayerId>>, responses: &mut VecDeque<Message>) {
if let Some(path) = path {
responses.push_back(DocumentMessage::Overlays(Operation::DeleteLayer { path }.into()).into());
responses.add(DocumentMessage::Overlays(Operation::DeleteLayer { path }.into()));
}
}
@@ -215,7 +215,7 @@ impl OverlayRenderer {
style: style::PathStyle::new(Some(Stroke::new(COLOR_ACCENT, 1.0)), Fill::None),
insert_index: -1,
};
responses.push_front(DocumentMessage::Overlays(operation.into()).into());
responses.add_front(DocumentMessage::Overlays(operation.into()));
layer_path
}
@@ -226,12 +226,12 @@ impl OverlayRenderer {
fn place_outline_overlays(outline_path: Vec<LayerId>, parent_transform: &DAffine2, responses: &mut VecDeque<Message>) {
let transform_message = Self::overlay_transform_message(outline_path, parent_transform.to_cols_array());
responses.push_back(transform_message);
responses.add(transform_message);
}
fn modify_outline_overlays(outline_path: Vec<LayerId>, subpath: graphene_core::vector::Subpath, responses: &mut VecDeque<Message>) {
let outline_modify_message = Self::overlay_modify_message(outline_path, subpath);
responses.push_back(outline_modify_message);
responses.add(outline_modify_message);
}
/// Updates the position of the overlays based on the [Subpath] points.
@@ -245,7 +245,7 @@ impl OverlayRenderer {
let translation = (parent_transform.transform_point2(handle_position) + VIEWPORT_GRID_ROUNDING_BIAS).round() + DVec2::splat(0.5);
let transform = DAffine2::from_scale_angle_translation(scale, angle, translation).to_cols_array();
responses.push_back(Self::overlay_transform_message(line_overlay.to_vec(), transform));
responses.add(Self::overlay_transform_message(line_overlay.to_vec(), transform));
let marker_overlay = marker_source.take().unwrap_or_else(|| Self::create_handle_overlay(responses));
@@ -254,7 +254,7 @@ impl OverlayRenderer {
let translation = (parent_transform.transform_point2(handle_position) - (scale / 2.) + VIEWPORT_GRID_ROUNDING_BIAS).round();
let transform = DAffine2::from_scale_angle_translation(scale, angle, translation).to_cols_array();
responses.push_back(Self::overlay_transform_message(marker_overlay.clone(), transform));
responses.add(Self::overlay_transform_message(marker_overlay.clone(), transform));
*marker_source = Some(marker_overlay);
};
@@ -275,7 +275,7 @@ impl OverlayRenderer {
let transform = DAffine2::from_scale_angle_translation(scale, angle, translation).to_cols_array();
let message = Self::overlay_transform_message(anchor_overlay.clone(), transform);
responses.push_back(message);
responses.add(message);
}
}
@@ -283,23 +283,23 @@ impl OverlayRenderer {
fn remove_manipulator_group_overlays(overlay_paths: &ManipulatorGroupOverlays, responses: &mut VecDeque<Message>) {
overlay_paths.iter().flatten().for_each(|layer_id| {
trace!("Overlay: Sending delete message for: {:?}", layer_id);
responses.push_back(DocumentMessage::Overlays(Operation::DeleteLayer { path: layer_id.clone() }.into()).into());
responses.add(DocumentMessage::Overlays(Operation::DeleteLayer { path: layer_id.clone() }.into()));
});
}
fn remove_outline_overlays(overlay_path: Vec<LayerId>, responses: &mut VecDeque<Message>) {
responses.push_back(DocumentMessage::Overlays(Operation::DeleteLayer { path: overlay_path }.into()).into());
responses.add(DocumentMessage::Overlays(Operation::DeleteLayer { path: overlay_path }.into()));
}
/// Sets the visibility of the handles overlay.
fn set_manipulator_group_overlay_visibility(manipulator_group_overlays: &ManipulatorGroupOverlays, visibility: bool, responses: &mut VecDeque<Message>) {
manipulator_group_overlays.iter().flatten().for_each(|layer_id| {
responses.push_back(Self::overlay_visibility_message(layer_id.clone(), visibility));
responses.add(Self::overlay_visibility_message(layer_id.clone(), visibility));
});
}
fn set_outline_overlay_visibility(overlay_path: Vec<LayerId>, visibility: bool, responses: &mut VecDeque<Message>) {
responses.push_back(Self::overlay_visibility_message(overlay_path, visibility));
responses.add(Self::overlay_visibility_message(overlay_path, visibility));
}
/// Create a visibility message for an overlay.
@@ -340,7 +340,7 @@ impl OverlayRenderer {
.is_some();
let style = if selected { selected_style.clone() } else { deselected_style.clone() };
responses.push_back(DocumentMessage::Overlays(Operation::SetLayerStyle { path: overlay_path.clone(), style }.into()).into());
responses.add(DocumentMessage::Overlays(Operation::SetLayerStyle { path: overlay_path.clone(), style }.into()));
}
}
}
editor/src/messages/tool/common_functionality/path_outline.rs
+7 -7
View File
@@ -51,7 +51,7 @@ impl PathOutline {
transform: DAffine2::IDENTITY.to_cols_array(),
};
responses.push_back(DocumentMessage::Overlays(operation.into()).into());
responses.add(DocumentMessage::Overlays(operation.into()));
overlay_path
}
@@ -59,14 +59,14 @@ impl PathOutline {
// Update the shape bezpath
let operation = Operation::SetShapePath { path: overlay.clone(), subpath };
responses.push_back(DocumentMessage::Overlays(operation.into()).into());
responses.add(DocumentMessage::Overlays(operation.into()));
// Update the transform to match the document
let operation = Operation::SetLayerTransform {
path: overlay.clone(),
transform: document.document_legacy.multiply_transforms(&document_layer_path).unwrap().to_cols_array(),
};
responses.push_back(DocumentMessage::Overlays(operation.into()).into());
responses.add(DocumentMessage::Overlays(operation.into()));
Some(overlay)
}
@@ -87,7 +87,7 @@ impl PathOutline {
// Discard the overlay layer if it exists
if let Some(overlay_path) = copied_overlay_path {
let operation = Operation::DeleteLayer { path: overlay_path };
responses.push_back(DocumentMessage::Overlays(operation.into()).into());
responses.add(DocumentMessage::Overlays(operation.into()));
}
}
result
@@ -97,7 +97,7 @@ impl PathOutline {
pub fn clear_hovered(&mut self, responses: &mut VecDeque<Message>) {
if let Some(path) = self.hovered_overlay_path.take() {
let operation = Operation::DeleteLayer { path };
responses.push_back(DocumentMessage::Overlays(operation.into()).into());
responses.add(DocumentMessage::Overlays(operation.into()));
}
self.hovered_layer_path = None;
}
@@ -131,7 +131,7 @@ impl PathOutline {
pub fn clear_selected(&mut self, responses: &mut VecDeque<Message>) {
while let Some(path) = self.selected_overlay_paths.pop() {
let operation = Operation::DeleteLayer { path };
responses.push_back(DocumentMessage::Overlays(operation.into()).into());
responses.add(DocumentMessage::Overlays(operation.into()));
}
}
@@ -146,7 +146,7 @@ impl PathOutline {
}
for path in old_overlay_paths {
let operation = Operation::DeleteLayer { path };
responses.push_back(DocumentMessage::Overlays(operation.into()).into());
responses.add(DocumentMessage::Overlays(operation.into()));
}
}
}
editor/src/messages/tool/common_functionality/pivot.rs
+22 -28
View File
@@ -93,7 +93,7 @@ impl Pivot {
pub fn clear_overlays(&mut self, responses: &mut VecDeque<Message>) {
if let Some(overlays) = self.pivot_overlay_circles.take() {
for path in overlays {
responses.push_back(DocumentMessage::Overlays(Operation::DeleteLayer { path }.into()).into());
responses.add(DocumentMessage::Overlays(Operation::DeleteLayer { path }.into()));
}
}
}
@@ -107,43 +107,37 @@ impl Pivot {
};
let layer_paths = [vec![generate_uuid()], vec![generate_uuid()]];
responses.push_back(
DocumentMessage::Overlays(
Operation::AddEllipse {
path: layer_paths[0].clone(),
transform: DAffine2::IDENTITY.to_cols_array(),
style: style::PathStyle::new(
Some(style::Stroke::new(COLOR_ACCENT, PIVOT_OUTER_OUTLINE_THICKNESS)),
style::Fill::Solid(graphene_core::raster::color::Color::WHITE),
),
insert_index: -1,
}
.into(),
)
responses.add(DocumentMessage::Overlays(
Operation::AddEllipse {
path: layer_paths[0].clone(),
transform: DAffine2::IDENTITY.to_cols_array(),
style: style::PathStyle::new(
Some(style::Stroke::new(COLOR_ACCENT, PIVOT_OUTER_OUTLINE_THICKNESS)),
style::Fill::Solid(graphene_core::raster::color::Color::WHITE),
),
insert_index: -1,
}
.into(),
);
responses.push_back(
DocumentMessage::Overlays(
Operation::AddEllipse {
path: layer_paths[1].clone(),
transform: DAffine2::IDENTITY.to_cols_array(),
style: style::PathStyle::new(None, style::Fill::Solid(COLOR_ACCENT)),
insert_index: -1,
}
.into(),
)
));
responses.add(DocumentMessage::Overlays(
Operation::AddEllipse {
path: layer_paths[1].clone(),
transform: DAffine2::IDENTITY.to_cols_array(),
style: style::PathStyle::new(None, style::Fill::Solid(COLOR_ACCENT)),
insert_index: -1,
}
.into(),
);
));
self.pivot_overlay_circles = Some(layer_paths.clone());
let [outer, inner] = layer_paths;
let pivot_diameter_without_outline = PIVOT_OUTER - PIVOT_OUTER_OUTLINE_THICKNESS;
let transform = DAffine2::from_scale_angle_translation(DVec2::splat(pivot_diameter_without_outline), 0., pivot - DVec2::splat(pivot_diameter_without_outline / 2.)).to_cols_array();
responses.push_back(DocumentMessage::Overlays(Operation::TransformLayerInViewport { path: outer, transform }.into()).into());
responses.add(DocumentMessage::Overlays(Operation::TransformLayerInViewport { path: outer, transform }.into()));
let transform = DAffine2::from_scale_angle_translation(DVec2::splat(PIVOT_INNER), 0., pivot - DVec2::splat(PIVOT_INNER / 2.)).to_cols_array();
responses.push_back(DocumentMessage::Overlays(Operation::TransformLayerInViewport { path: inner, transform }.into()).into());
responses.add(DocumentMessage::Overlays(Operation::TransformLayerInViewport { path: inner, transform }.into()));
}
pub fn update_pivot(&mut self, document: &DocumentMessageHandler, render_data: &RenderData, responses: &mut VecDeque<Message>) {
editor/src/messages/tool/common_functionality/snapping.rs
+19 -22
View File
@@ -29,40 +29,37 @@ impl SnapOverlays {
// If there isn't one in the pool to ruse, add a new alignment line to the pool with the intended transform
let layer_path = if index >= overlay_paths.len() {
let layer_path = vec![generate_uuid()];
responses.push_back(
DocumentMessage::Overlays(
if is_axis {
Operation::AddLine {
path: layer_path.clone(),
transform,
style: style::PathStyle::new(Some(Stroke::new(COLOR_ACCENT, 1.0)), style::Fill::None),
insert_index: -1,
}
} else {
Operation::AddEllipse {
path: layer_path.clone(),
transform,
style: style::PathStyle::new(None, style::Fill::Solid(COLOR_ACCENT)),
insert_index: -1,
}
responses.add(DocumentMessage::Overlays(
if is_axis {
Operation::AddLine {
path: layer_path.clone(),
transform,
style: style::PathStyle::new(Some(Stroke::new(COLOR_ACCENT, 1.0)), style::Fill::None),
insert_index: -1,
}
.into(),
)
} else {
Operation::AddEllipse {
path: layer_path.clone(),
transform,
style: style::PathStyle::new(None, style::Fill::Solid(COLOR_ACCENT)),
insert_index: -1,
}
}
.into(),
);
));
overlay_paths.push(layer_path.clone());
layer_path
}
// Otherwise, reuse an overlay from the pool and update its new transform
else {
let layer_path = overlay_paths[index].clone();
responses.push_back(DocumentMessage::Overlays(Operation::SetLayerTransform { path: layer_path.clone(), transform }.into()).into());
responses.add(DocumentMessage::Overlays(Operation::SetLayerTransform { path: layer_path.clone(), transform }.into()));
layer_path
};
// Then set its opacity to the fade amount
if let Some(opacity) = opacity {
responses.push_back(DocumentMessage::Overlays(Operation::SetLayerOpacity { path: layer_path, opacity }.into()).into());
responses.add(DocumentMessage::Overlays(Operation::SetLayerOpacity { path: layer_path, opacity }.into()));
}
}
@@ -147,7 +144,7 @@ impl SnapOverlays {
/// Remove overlays from the pool beyond a given index. Pool entries up through that index will be kept.
fn remove_unused_overlays(overlay_paths: &mut Vec<Vec<LayerId>>, responses: &mut VecDeque<Message>, remove_after_index: usize) {
while overlay_paths.len() > remove_after_index {
responses.push_back(DocumentMessage::Overlays(Operation::DeleteLayer { path: overlay_paths.pop().unwrap() }.into()).into());
responses.add(DocumentMessage::Overlays(Operation::DeleteLayer { path: overlay_paths.pop().unwrap() }.into()));
}
}
editor/src/messages/tool/common_functionality/transformation_cage.rs
+5 -5
View File
@@ -159,7 +159,7 @@ pub fn add_bounding_box(responses: &mut VecDeque<Message>) -> Vec<LayerId> {
style: style::PathStyle::new(Some(Stroke::new(COLOR_ACCENT, 1.0)), Fill::None),
insert_index: -1,
};
responses.push_back(DocumentMessage::Overlays(operation.into()).into());
responses.add(DocumentMessage::Overlays(operation.into()));
path
}
@@ -178,7 +178,7 @@ fn add_transform_handles(responses: &mut VecDeque<Message>) -> [Vec<LayerId>; 8]
style: style::PathStyle::new(Some(Stroke::new(COLOR_ACCENT, 2.0)), Fill::solid(Color::WHITE)),
insert_index: -1,
};
responses.push_back(DocumentMessage::Overlays(operation.into()).into());
responses.add(DocumentMessage::Overlays(operation.into()));
*item = current_path;
}
@@ -253,7 +253,7 @@ impl BoundingBoxOverlays {
pub fn transform(&mut self, responses: &mut VecDeque<Message>) {
let transform = transform_from_box(self.bounds[0], self.bounds[1], self.transform).to_cols_array();
let path = self.bounding_box.clone();
responses.push_back(DocumentMessage::Overlays(Operation::SetLayerTransformInViewport { path, transform }.into()).into());
responses.add(DocumentMessage::Overlays(Operation::SetLayerTransformInViewport { path, transform }.into()));
// Helps push values that end in approximately half, plus or minus some floating point imprecision, towards the same side of the round() function
const BIAS: f64 = 0.0001;
@@ -263,7 +263,7 @@ impl BoundingBoxOverlays {
let translation = (position - (scale / 2.) - 0.5 + BIAS).round();
let transform = DAffine2::from_scale_angle_translation(scale, 0., translation).to_cols_array();
let path = path.clone();
responses.push_back(DocumentMessage::Overlays(Operation::SetLayerTransformInViewport { path, transform }.into()).into());
responses.add(DocumentMessage::Overlays(Operation::SetLayerTransformInViewport { path, transform }.into()));
}
}
@@ -341,7 +341,7 @@ impl BoundingBoxOverlays {
/// Removes the overlays
pub fn delete(self, responses: &mut VecDeque<Message>) {
responses.push_back(DocumentMessage::Overlays(Operation::DeleteLayer { path: self.bounding_box }.into()).into());
responses.add(DocumentMessage::Overlays(Operation::DeleteLayer { path: self.bounding_box }.into()));
responses.extend(
self.transform_handles
.iter()
editor/src/messages/tool/tool_message_handler.rs
+23 -23
View File
@@ -38,41 +38,41 @@ impl MessageHandler<ToolMessage, (&DocumentMessageHandler, u64, &InputPreprocess
.process_message(message, responses, (document, input, &render_data, &self.tool_state.tool_data, &mut self.shape_editor)),
#[remain::unsorted]
ToolMessage::ActivateToolSelect => responses.push_front(ToolMessage::ActivateTool { tool_type: ToolType::Select }.into()),
ToolMessage::ActivateToolSelect => responses.add_front(ToolMessage::ActivateTool { tool_type: ToolType::Select }),
#[remain::unsorted]
ToolMessage::ActivateToolArtboard => responses.push_front(ToolMessage::ActivateTool { tool_type: ToolType::Artboard }.into()),
ToolMessage::ActivateToolArtboard => responses.add_front(ToolMessage::ActivateTool { tool_type: ToolType::Artboard }),
#[remain::unsorted]
ToolMessage::ActivateToolNavigate => responses.push_front(ToolMessage::ActivateTool { tool_type: ToolType::Navigate }.into()),
ToolMessage::ActivateToolNavigate => responses.add_front(ToolMessage::ActivateTool { tool_type: ToolType::Navigate }),
#[remain::unsorted]
ToolMessage::ActivateToolEyedropper => responses.push_front(ToolMessage::ActivateTool { tool_type: ToolType::Eyedropper }.into()),
ToolMessage::ActivateToolEyedropper => responses.add_front(ToolMessage::ActivateTool { tool_type: ToolType::Eyedropper }),
#[remain::unsorted]
ToolMessage::ActivateToolText => responses.push_front(ToolMessage::ActivateTool { tool_type: ToolType::Text }.into()),
ToolMessage::ActivateToolText => responses.add_front(ToolMessage::ActivateTool { tool_type: ToolType::Text }),
#[remain::unsorted]
ToolMessage::ActivateToolFill => responses.push_front(ToolMessage::ActivateTool { tool_type: ToolType::Fill }.into()),
ToolMessage::ActivateToolFill => responses.add_front(ToolMessage::ActivateTool { tool_type: ToolType::Fill }),
#[remain::unsorted]
ToolMessage::ActivateToolGradient => responses.push_front(ToolMessage::ActivateTool { tool_type: ToolType::Gradient }.into()),
ToolMessage::ActivateToolGradient => responses.add_front(ToolMessage::ActivateTool { tool_type: ToolType::Gradient }),
#[remain::unsorted]
ToolMessage::ActivateToolPath => responses.push_front(ToolMessage::ActivateTool { tool_type: ToolType::Path }.into()),
ToolMessage::ActivateToolPath => responses.add_front(ToolMessage::ActivateTool { tool_type: ToolType::Path }),
#[remain::unsorted]
ToolMessage::ActivateToolPen => responses.push_front(ToolMessage::ActivateTool { tool_type: ToolType::Pen }.into()),
ToolMessage::ActivateToolPen => responses.add_front(ToolMessage::ActivateTool { tool_type: ToolType::Pen }),
#[remain::unsorted]
ToolMessage::ActivateToolFreehand => responses.push_front(ToolMessage::ActivateTool { tool_type: ToolType::Freehand }.into()),
ToolMessage::ActivateToolFreehand => responses.add_front(ToolMessage::ActivateTool { tool_type: ToolType::Freehand }),
#[remain::unsorted]
ToolMessage::ActivateToolSpline => responses.push_front(ToolMessage::ActivateTool { tool_type: ToolType::Spline }.into()),
ToolMessage::ActivateToolSpline => responses.add_front(ToolMessage::ActivateTool { tool_type: ToolType::Spline }),
#[remain::unsorted]
ToolMessage::ActivateToolLine => responses.push_front(ToolMessage::ActivateTool { tool_type: ToolType::Line }.into()),
ToolMessage::ActivateToolLine => responses.add_front(ToolMessage::ActivateTool { tool_type: ToolType::Line }),
#[remain::unsorted]
ToolMessage::ActivateToolRectangle => responses.push_front(ToolMessage::ActivateTool { tool_type: ToolType::Rectangle }.into()),
ToolMessage::ActivateToolRectangle => responses.add_front(ToolMessage::ActivateTool { tool_type: ToolType::Rectangle }),
#[remain::unsorted]
ToolMessage::ActivateToolEllipse => responses.push_front(ToolMessage::ActivateTool { tool_type: ToolType::Ellipse }.into()),
ToolMessage::ActivateToolEllipse => responses.add_front(ToolMessage::ActivateTool { tool_type: ToolType::Ellipse }),
#[remain::unsorted]
ToolMessage::ActivateToolShape => responses.push_front(ToolMessage::ActivateTool { tool_type: ToolType::Shape }.into()),
ToolMessage::ActivateToolShape => responses.add_front(ToolMessage::ActivateTool { tool_type: ToolType::Shape }),
#[remain::unsorted]
ToolMessage::ActivateToolBrush => responses.push_front(ToolMessage::ActivateTool { tool_type: ToolType::Brush }.into()),
ToolMessage::ActivateToolBrush => responses.add_front(ToolMessage::ActivateTool { tool_type: ToolType::Brush }),
#[remain::unsorted]
ToolMessage::ActivateToolImaginate => responses.push_front(ToolMessage::ActivateTool { tool_type: ToolType::Imaginate }.into()),
ToolMessage::ActivateToolImaginate => responses.add_front(ToolMessage::ActivateTool { tool_type: ToolType::Imaginate }),
ToolMessage::ActivateTool { tool_type } => {
let tool_data = &mut self.tool_state.tool_data;
@@ -122,13 +122,13 @@ impl MessageHandler<ToolMessage, (&DocumentMessageHandler, u64, &InputPreprocess
tool_data.tools.get(&tool_type).unwrap().activate(responses);
// Send the SelectionChanged message to the active tool, this will ensure the selection is updated
responses.push_back(BroadcastEvent::SelectionChanged.into());
responses.add(BroadcastEvent::SelectionChanged);
// Send the DocumentIsDirty message to the active tool's sub-tool message handler
responses.push_back(BroadcastEvent::DocumentIsDirty.into());
responses.add(BroadcastEvent::DocumentIsDirty);
// Send tool options to the frontend
responses.push_back(ToolMessage::RefreshToolOptions.into());
responses.add(ToolMessage::RefreshToolOptions);
// Notify the frontend about the new active tool to be displayed
tool_data.register_properties(responses, LayoutTarget::ToolShelf);
@@ -140,13 +140,13 @@ impl MessageHandler<ToolMessage, (&DocumentMessageHandler, u64, &InputPreprocess
// Unsubscribe the transform layer to selection change events
let message = Box::new(TransformLayerMessage::SelectionChanged.into());
let on = BroadcastEvent::SelectionChanged;
responses.push_back(BroadcastMessage::UnsubscribeEvent { message, on }.into());
responses.add(BroadcastMessage::UnsubscribeEvent { message, on });
}
ToolMessage::InitTools => {
// Subscribe the transform layer to selection change events
let send = Box::new(TransformLayerMessage::SelectionChanged.into());
let on = BroadcastEvent::SelectionChanged;
responses.push_back(BroadcastMessage::SubscribeEvent { send, on }.into());
responses.add(BroadcastMessage::SubscribeEvent { send, on });
let tool_data = &mut self.tool_state.tool_data;
let document_data = &self.tool_state.document_tool_data;
@@ -163,7 +163,7 @@ impl MessageHandler<ToolMessage, (&DocumentMessageHandler, u64, &InputPreprocess
// Notify the frontend about the initial working colors
document_data.update_working_colors(responses);
responses.push_back(FrontendMessage::TriggerRefreshBoundsOfViewports.into());
responses.add(FrontendMessage::TriggerRefreshBoundsOfViewports);
let mut data = ToolActionHandlerData {
document,
editor/src/messages/tool/tool_messages/artboard_tool.rs
+55 -82
View File
@@ -132,14 +132,11 @@ impl Fsm for ArtboardToolFsmState {
tool_data.bounding_box_overlays = Some(bounding_box_overlays);
responses.push_back(OverlaysMessage::Rerender.into());
responses.push_back(
PropertiesPanelMessage::SetActiveLayers {
paths: vec![vec![tool_data.selected_artboard.unwrap()]],
document: TargetDocument::Artboard,
}
.into(),
);
responses.add(OverlaysMessage::Rerender);
responses.add(PropertiesPanelMessage::SetActiveLayers {
paths: vec![vec![tool_data.selected_artboard.unwrap()]],
document: TargetDocument::Artboard,
});
}
_ => {}
};
@@ -165,7 +162,7 @@ impl Fsm for ArtboardToolFsmState {
};
if let Some(selected_edges) = dragging_bounds {
responses.push_back(DocumentMessage::StartTransaction.into());
responses.add(DocumentMessage::StartTransaction);
let snap_x = selected_edges.2 || selected_edges.3;
let snap_y = selected_edges.0 || selected_edges.1;
@@ -185,12 +182,12 @@ impl Fsm for ArtboardToolFsmState {
ArtboardToolFsmState::ResizingBounds
} else {
responses.push_back(DocumentMessage::StartTransaction.into());
responses.add(DocumentMessage::StartTransaction);
let tolerance = DVec2::splat(SELECTION_TOLERANCE);
let quad = Quad::from_box([input.mouse.position - tolerance, input.mouse.position + tolerance]);
let intersection = document.artboard_message_handler.artboards_document.intersects_quad_root(quad, render_data);
responses.push_back(BroadcastEvent::DocumentIsDirty.into());
responses.add(BroadcastEvent::DocumentIsDirty);
if let Some(intersection) = intersection.last() {
tool_data.selected_artboard = Some(intersection[0]);
@@ -199,19 +196,16 @@ impl Fsm for ArtboardToolFsmState {
.start_snap(document, input, document.bounding_boxes(None, Some(intersection[0]), render_data), true, true);
tool_data.snap_manager.add_all_document_handles(document, input, &[], &[], &[]);
responses.push_back(
PropertiesPanelMessage::SetActiveLayers {
paths: vec![intersection.clone()],
document: TargetDocument::Artboard,
}
.into(),
);
responses.add(PropertiesPanelMessage::SetActiveLayers {
paths: vec![intersection.clone()],
document: TargetDocument::Artboard,
});
ArtboardToolFsmState::Dragging
} else {
tool_data.selected_artboard = None;
responses.push_back(PropertiesPanelMessage::ClearSelection.into());
responses.add(PropertiesPanelMessage::ClearSelection);
ArtboardToolFsmState::Drawing
}
@@ -227,16 +221,13 @@ impl Fsm for ArtboardToolFsmState {
let snapped_mouse_position = tool_data.snap_manager.snap_position(responses, document, mouse_position);
let (position, size) = movement.new_size(snapped_mouse_position, bounds.transform, from_center, bounds.center_of_transformation, constrain_square);
responses.push_back(
ArtboardMessage::ResizeArtboard {
artboard: tool_data.selected_artboard.unwrap(),
position: position.round().into(),
size: size.round().into(),
}
.into(),
);
responses.add(ArtboardMessage::ResizeArtboard {
artboard: tool_data.selected_artboard.unwrap(),
position: position.round().into(),
size: size.round().into(),
});
responses.push_back(BroadcastEvent::DocumentIsDirty.into());
responses.add(BroadcastEvent::DocumentIsDirty);
}
}
ArtboardToolFsmState::ResizingBounds
@@ -255,16 +246,13 @@ impl Fsm for ArtboardToolFsmState {
let position = bounds.bounds[0] + bounds.transform.inverse().transform_vector2(mouse_position - tool_data.drag_current + closest_move);
responses.push_back(
ArtboardMessage::ResizeArtboard {
artboard: tool_data.selected_artboard.unwrap(),
position: position.round().into(),
size: size.round().into(),
}
.into(),
);
responses.add(ArtboardMessage::ResizeArtboard {
artboard: tool_data.selected_artboard.unwrap(),
position: position.round().into(),
size: size.round().into(),
});
responses.push_back(BroadcastEvent::DocumentIsDirty.into());
responses.add(BroadcastEvent::DocumentIsDirty);
tool_data.drag_current = mouse_position + closest_move;
}
@@ -292,14 +280,11 @@ impl Fsm for ArtboardToolFsmState {
let size = root_transform.transform_vector2(size);
if let Some(artboard) = tool_data.selected_artboard {
responses.push_back(
ArtboardMessage::ResizeArtboard {
artboard,
position: start.round().into(),
size: size.round().into(),
}
.into(),
);
responses.add(ArtboardMessage::ResizeArtboard {
artboard,
position: start.round().into(),
size: size.round().into(),
});
} else {
let id = generate_uuid();
tool_data.selected_artboard = Some(id);
@@ -307,27 +292,21 @@ impl Fsm for ArtboardToolFsmState {
tool_data.snap_manager.start_snap(document, input, document.bounding_boxes(None, Some(id), render_data), true, true);
tool_data.snap_manager.add_all_document_handles(document, input, &[], &[], &[]);
responses.push_back(
ArtboardMessage::AddArtboard {
id: Some(id),
position: start.round().into(),
size: (1., 1.),
}
.into(),
);
responses.add(ArtboardMessage::AddArtboard {
id: Some(id),
position: start.round().into(),
size: (1., 1.),
});
}
// Have to put message here instead of when Artboard is created
// This might result in a few more calls but it is not reliant on the order of messages
responses.push_back(
PropertiesPanelMessage::SetActiveLayers {
paths: vec![vec![tool_data.selected_artboard.unwrap()]],
document: TargetDocument::Artboard,
}
.into(),
);
responses.add(PropertiesPanelMessage::SetActiveLayers {
paths: vec![vec![tool_data.selected_artboard.unwrap()]],
document: TargetDocument::Artboard,
});
responses.push_back(BroadcastEvent::DocumentIsDirty.into());
responses.add(BroadcastEvent::DocumentIsDirty);
ArtboardToolFsmState::Drawing
}
@@ -336,7 +315,7 @@ impl Fsm for ArtboardToolFsmState {
if tool_data.cursor != cursor {
tool_data.cursor = cursor;
responses.push_back(FrontendMessage::UpdateMouseCursor { cursor }.into());
responses.add(FrontendMessage::UpdateMouseCursor { cursor });
}
ArtboardToolFsmState::Ready
@@ -357,7 +336,7 @@ impl Fsm for ArtboardToolFsmState {
bounds.original_transforms.clear();
}
responses.push_back(BroadcastEvent::DocumentIsDirty.into());
responses.add(BroadcastEvent::DocumentIsDirty);
ArtboardToolFsmState::Ready
}
@@ -372,21 +351,18 @@ impl Fsm for ArtboardToolFsmState {
}
(_, ArtboardToolMessage::DeleteSelected) => {
if let Some(artboard) = tool_data.selected_artboard.take() {
responses.push_back(ArtboardMessage::DeleteArtboard { artboard }.into());
responses.push_back(BroadcastEvent::DocumentIsDirty.into());
responses.add(ArtboardMessage::DeleteArtboard { artboard });
responses.add(BroadcastEvent::DocumentIsDirty);
}
ArtboardToolFsmState::Ready
}
(_, ArtboardToolMessage::NudgeSelected { delta_x, delta_y }) => {
if let Some(bounds) = &mut tool_data.bounding_box_overlays {
responses.push_back(
ArtboardMessage::ResizeArtboard {
artboard: tool_data.selected_artboard.unwrap(),
position: (bounds.bounds[0].x + delta_x, bounds.bounds[0].y + delta_y),
size: (bounds.bounds[1] - bounds.bounds[0]).round().into(),
}
.into(),
);
responses.add(ArtboardMessage::ResizeArtboard {
artboard: tool_data.selected_artboard.unwrap(),
position: (bounds.bounds[0].x + delta_x, bounds.bounds[0].y + delta_y),
size: (bounds.bounds[1] - bounds.bounds[0]).round().into(),
});
}
ArtboardToolFsmState::Ready
@@ -397,13 +373,10 @@ impl Fsm for ArtboardToolFsmState {
}
// Register properties when switching back to other tools
responses.push_back(
PropertiesPanelMessage::SetActiveLayers {
paths: document.selected_layers().map(|path| path.to_vec()).collect(),
document: TargetDocument::Artwork,
}
.into(),
);
responses.add(PropertiesPanelMessage::SetActiveLayers {
paths: document.selected_layers().map(|path| path.to_vec()).collect(),
document: TargetDocument::Artwork,
});
tool_data.snap_manager.cleanup(responses);
ArtboardToolFsmState::Ready
@@ -428,10 +401,10 @@ impl Fsm for ArtboardToolFsmState {
}
};
responses.push_back(FrontendMessage::UpdateInputHints { hint_data }.into());
responses.add(FrontendMessage::UpdateInputHints { hint_data });
}
fn update_cursor(&self, responses: &mut VecDeque<Message>) {
responses.push_back(FrontendMessage::UpdateMouseCursor { cursor: MouseCursorIcon::Default }.into());
responses.add(FrontendMessage::UpdateMouseCursor { cursor: MouseCursorIcon::Default });
}
}
editor/src/messages/tool/tool_messages/brush_tool.rs
+6 -6
View File
@@ -215,14 +215,14 @@ impl Fsm for BrushToolFsmState {
if let ToolMessage::Brush(event) = event {
match (self, event) {
(Ready, DragStart) => {
responses.push_back(DocumentMessage::StartTransaction.into());
responses.add(DocumentMessage::StartTransaction);
let existing_points = load_existing_points(document);
let new_layer = existing_points.is_none();
if let Some((layer_path, points)) = existing_points {
tool_data.path = Some(layer_path);
tool_data.points = points;
} else {
responses.push_back(DocumentMessage::DeselectAllLayers.into());
responses.add(DocumentMessage::DeselectAllLayers);
tool_data.path = Some(document.get_path_for_new_layer());
}
@@ -262,9 +262,9 @@ impl Fsm for BrushToolFsmState {
}
(Drawing, DragStop) | (Drawing, Abort) => {
if !tool_data.points.is_empty() {
responses.push_back(DocumentMessage::CommitTransaction.into());
responses.add(DocumentMessage::CommitTransaction);
} else {
responses.push_back(DocumentMessage::AbortTransaction.into());
responses.add(DocumentMessage::AbortTransaction);
}
tool_data.path = None;
@@ -285,11 +285,11 @@ impl Fsm for BrushToolFsmState {
BrushToolFsmState::Drawing => HintData(vec![]),
};
responses.push_back(FrontendMessage::UpdateInputHints { hint_data }.into());
responses.add(FrontendMessage::UpdateInputHints { hint_data });
}
fn update_cursor(&self, responses: &mut VecDeque<Message>) {
responses.push_back(FrontendMessage::UpdateMouseCursor { cursor: MouseCursorIcon::Default }.into());
responses.add(FrontendMessage::UpdateMouseCursor { cursor: MouseCursorIcon::Default });
}
}
editor/src/messages/tool/tool_messages/ellipse_tool.rs
+5 -5
View File
@@ -119,7 +119,7 @@ impl Fsm for EllipseToolFsmState {
match (self, event) {
(Ready, DragStart) => {
shape_data.start(responses, document, input, render_data);
responses.push_back(DocumentMessage::StartTransaction.into());
responses.add(DocumentMessage::StartTransaction);
// Create a new layer path for this shape
let layer_path = document.get_path_for_new_layer();
@@ -141,7 +141,7 @@ impl Fsm for EllipseToolFsmState {
}
(state, Resize { center, lock_ratio }) => {
if let Some(message) = shape_data.calculate_transform(responses, document, input, center, lock_ratio, false) {
responses.push_back(message);
responses.add(message);
}
state
@@ -153,7 +153,7 @@ impl Fsm for EllipseToolFsmState {
Ready
}
(Drawing, Abort) => {
responses.push_back(DocumentMessage::AbortTransaction.into());
responses.add(DocumentMessage::AbortTransaction);
shape_data.cleanup(responses);
Ready
@@ -175,10 +175,10 @@ impl Fsm for EllipseToolFsmState {
EllipseToolFsmState::Drawing => HintData(vec![HintGroup(vec![HintInfo::keys([Key::Shift], "Constrain Circular"), HintInfo::keys([Key::Alt], "From Center")])]),
};
responses.push_back(FrontendMessage::UpdateInputHints { hint_data }.into());
responses.add(FrontendMessage::UpdateInputHints { hint_data });
}
fn update_cursor(&self, responses: &mut VecDeque<Message>) {
responses.push_back(FrontendMessage::UpdateMouseCursor { cursor: MouseCursorIcon::Crosshair }.into());
responses.add(FrontendMessage::UpdateMouseCursor { cursor: MouseCursorIcon::Crosshair });
}
}
editor/src/messages/tool/tool_messages/eyedropper_tool.rs
+14 -20
View File
@@ -147,7 +147,7 @@ impl Fsm for EyedropperToolFsmState {
EyedropperToolFsmState::SamplingPrimary | EyedropperToolFsmState::SamplingSecondary => HintData(vec![HintGroup(vec![HintInfo::keys([Key::Escape], "Cancel")])]),
};
responses.push_back(FrontendMessage::UpdateInputHints { hint_data }.into());
responses.add(FrontendMessage::UpdateInputHints { hint_data });
}
fn update_cursor(&self, responses: &mut VecDeque<Message>) {
@@ -156,30 +156,24 @@ impl Fsm for EyedropperToolFsmState {
EyedropperToolFsmState::SamplingPrimary | EyedropperToolFsmState::SamplingSecondary => MouseCursorIcon::None,
};
responses.push_back(FrontendMessage::UpdateMouseCursor { cursor }.into());
responses.add(FrontendMessage::UpdateMouseCursor { cursor });
}
}
fn disable_cursor_preview(responses: &mut VecDeque<Message>) {
responses.push_back(
FrontendMessage::UpdateEyedropperSamplingState {
mouse_position: None,
primary_color: "".into(),
secondary_color: "".into(),
set_color_choice: None,
}
.into(),
);
responses.add(FrontendMessage::UpdateEyedropperSamplingState {
mouse_position: None,
primary_color: "".into(),
secondary_color: "".into(),
set_color_choice: None,
});
}
fn update_cursor_preview(responses: &mut VecDeque<Message>, input: &InputPreprocessorMessageHandler, global_tool_data: &DocumentToolData, set_color_choice: Option<String>) {
responses.push_back(
FrontendMessage::UpdateEyedropperSamplingState {
mouse_position: Some(input.mouse.position.into()),
primary_color: "#".to_string() + global_tool_data.primary_color.rgb_hex().as_str(),
secondary_color: "#".to_string() + global_tool_data.secondary_color.rgb_hex().as_str(),
set_color_choice,
}
.into(),
);
responses.add(FrontendMessage::UpdateEyedropperSamplingState {
mouse_position: Some(input.mouse.position.into()),
primary_color: "#".to_string() + global_tool_data.primary_color.rgb_hex().as_str(),
secondary_color: "#".to_string() + global_tool_data.secondary_color.rgb_hex().as_str(),
set_color_choice,
});
}
editor/src/messages/tool/tool_messages/fill_tool.rs
+2 -2
View File
@@ -136,10 +136,10 @@ impl Fsm for FillToolFsmState {
])]),
};
responses.push_back(FrontendMessage::UpdateInputHints { hint_data }.into());
responses.add(FrontendMessage::UpdateInputHints { hint_data });
}
fn update_cursor(&self, responses: &mut VecDeque<Message>) {
responses.push_back(FrontendMessage::UpdateMouseCursor { cursor: MouseCursorIcon::Default }.into());
responses.add(FrontendMessage::UpdateMouseCursor { cursor: MouseCursorIcon::Default });
}
}
editor/src/messages/tool/tool_messages/freehand_tool.rs
+7 -7
View File
@@ -152,8 +152,8 @@ impl Fsm for FreehandToolFsmState {
if let ToolMessage::Freehand(event) = event {
match (self, event) {
(Ready, DragStart) => {
responses.push_back(DocumentMessage::StartTransaction.into());
responses.push_back(DocumentMessage::DeselectAllLayers.into());
responses.add(DocumentMessage::StartTransaction);
responses.add(DocumentMessage::DeselectAllLayers);
tool_data.path = Some(document.get_path_for_new_layer());
let pos = transform.inverse().transform_point2(input.mouse.position);
@@ -179,11 +179,11 @@ impl Fsm for FreehandToolFsmState {
}
(Drawing, DragStop) | (Drawing, Abort) => {
if tool_data.points.len() >= 2 {
responses.push_back(remove_preview(tool_data));
responses.add(remove_preview(tool_data));
add_polyline(tool_data, global_tool_data, responses);
responses.push_back(DocumentMessage::CommitTransaction.into());
responses.add(DocumentMessage::CommitTransaction);
} else {
responses.push_back(DocumentMessage::AbortTransaction.into());
responses.add(DocumentMessage::AbortTransaction);
}
tool_data.path = None;
@@ -204,11 +204,11 @@ impl Fsm for FreehandToolFsmState {
FreehandToolFsmState::Drawing => HintData(vec![]),
};
responses.push_back(FrontendMessage::UpdateInputHints { hint_data }.into());
responses.add(FrontendMessage::UpdateInputHints { hint_data });
}
fn update_cursor(&self, responses: &mut VecDeque<Message>) {
responses.push_back(FrontendMessage::UpdateMouseCursor { cursor: MouseCursorIcon::Default }.into());
responses.add(FrontendMessage::UpdateMouseCursor { cursor: MouseCursorIcon::Default });
}
}
editor/src/messages/tool/tool_messages/gradient_tool.rs
+14 -14
View File
@@ -163,7 +163,7 @@ impl GradientOverlay {
style: PathStyle::new(Some(Stroke::new(COLOR_ACCENT, 1.0)), fill),
insert_index: -1,
};
responses.push_back(DocumentMessage::Overlays(operation.into()).into());
responses.add(DocumentMessage::Overlays(operation.into()));
path
}
@@ -182,7 +182,7 @@ impl GradientOverlay {
style: PathStyle::new(Some(Stroke::new(COLOR_ACCENT, 1.0)), Fill::None),
insert_index: -1,
};
responses.push_back(DocumentMessage::Overlays(operation.into()).into());
responses.add(DocumentMessage::Overlays(operation.into()));
path
}
@@ -224,12 +224,12 @@ impl GradientOverlay {
}
pub fn delete_overlays(self, responses: &mut VecDeque<Message>) {
responses.push_back(DocumentMessage::Overlays(Operation::DeleteLayer { path: self.line }.into()).into());
responses.add(DocumentMessage::Overlays(Operation::DeleteLayer { path: self.line }.into()));
let [start, end] = self.handles;
responses.push_back(DocumentMessage::Overlays(Operation::DeleteLayer { path: start }.into()).into());
responses.push_back(DocumentMessage::Overlays(Operation::DeleteLayer { path: end }.into()).into());
responses.add(DocumentMessage::Overlays(Operation::DeleteLayer { path: start }.into()));
responses.add(DocumentMessage::Overlays(Operation::DeleteLayer { path: end }.into()));
for step in self.steps {
responses.push_back(DocumentMessage::Overlays(Operation::DeleteLayer { path: step }.into()).into());
responses.add(DocumentMessage::Overlays(Operation::DeleteLayer { path: step }.into()));
}
}
@@ -278,7 +278,7 @@ impl SelectedGradient {
// Clear the gradient if layer deleted
let Ok(layer) = document.document_legacy.layer(&inner_gradient.path) else {
responses.push_back(ToolMessage::RefreshToolOptions.into());
responses.add(ToolMessage::RefreshToolOptions);
*gradient = None;
return;
};
@@ -288,13 +288,13 @@ impl SelectedGradient {
// Clear if no longer a gradient
let Some(gradient) = layer.style().ok().and_then(|style|style.fill().as_gradient()) else {
responses.push_back(ToolMessage::RefreshToolOptions.into());
responses.add(ToolMessage::RefreshToolOptions);
*gradient = None;
return;
};
if gradient.gradient_type != inner_gradient.gradient.gradient_type {
responses.push_back(ToolMessage::RefreshToolOptions.into());
responses.add(ToolMessage::RefreshToolOptions);
}
inner_gradient.gradient = gradient.clone();
}
@@ -519,7 +519,7 @@ impl Fsm for GradientToolFsmState {
self
}
(GradientToolFsmState::Ready, GradientToolMessage::PointerDown) => {
responses.push_back(BroadcastEvent::DocumentIsDirty.into());
responses.add(BroadcastEvent::DocumentIsDirty);
let mouse = input.mouse.position;
tool_data.drag_start = mouse;
@@ -570,12 +570,12 @@ impl Fsm for GradientToolFsmState {
if !document.selected_layers_contains(&intersection) {
let replacement_selected_layers = vec![intersection.clone()];
responses.push_back(DocumentMessage::SetSelectedLayers { replacement_selected_layers }.into());
responses.add(DocumentMessage::SetSelectedLayers { replacement_selected_layers });
}
let layer = document.document_legacy.layer(&intersection).unwrap();
responses.push_back(DocumentMessage::StartTransaction.into());
responses.add(DocumentMessage::StartTransaction);
// Use the already existing gradient if it exists
let gradient = if let Some(gradient) = layer.style().ok().map(|style| style.fill()).and_then(|fill| fill.as_gradient()) {
@@ -643,10 +643,10 @@ impl Fsm for GradientToolFsmState {
GradientToolFsmState::Drawing => HintData(vec![HintGroup(vec![HintInfo::keys([Key::Shift], "Snap 15°")])]),
};
responses.push_back(FrontendMessage::UpdateInputHints { hint_data }.into());
responses.add(FrontendMessage::UpdateInputHints { hint_data });
}
fn update_cursor(&self, responses: &mut VecDeque<Message>) {
responses.push_back(FrontendMessage::UpdateMouseCursor { cursor: MouseCursorIcon::Default }.into());
responses.add(FrontendMessage::UpdateMouseCursor { cursor: MouseCursorIcon::Default });
}
}
editor/src/messages/tool/tool_messages/line_tool.rs
+7 -7
View File
@@ -83,7 +83,7 @@ impl PropertyHolder for LineTool {
}
impl<'a> MessageHandler<ToolMessage, &mut ToolActionHandlerData<'a>> for LineTool {
fn process_message(&mut self, message: ToolMessage, messages: &mut VecDeque<Message>, tool_data: &mut ToolActionHandlerData<'a>) {
fn process_message(&mut self, message: ToolMessage, responses: &mut VecDeque<Message>, tool_data: &mut ToolActionHandlerData<'a>) {
if let ToolMessage::Line(LineToolMessage::UpdateOptions(action)) = message {
match action {
LineOptionsUpdate::LineWeight(line_weight) => self.options.line_weight = line_weight,
@@ -91,7 +91,7 @@ impl<'a> MessageHandler<ToolMessage, &mut ToolActionHandlerData<'a>> for LineToo
return;
}
self.fsm_state.process_event(message, &mut self.tool_data, tool_data, &self.options, messages, true);
self.fsm_state.process_event(message, &mut self.tool_data, tool_data, &self.options, responses, true);
}
fn actions(&self) -> ActionList {
@@ -159,7 +159,7 @@ impl Fsm for LineToolFsmState {
let subpath = bezier_rs::Subpath::new_line(DVec2::ZERO, DVec2::X);
responses.push_back(DocumentMessage::StartTransaction.into());
responses.add(DocumentMessage::StartTransaction);
let layer_path = document.get_path_for_new_layer();
tool_data.path = Some(layer_path.clone());
graph_modification_utils::new_vector_layer(vec![subpath], layer_path.clone(), responses);
@@ -176,7 +176,7 @@ impl Fsm for LineToolFsmState {
tool_data.drag_current = tool_data.snap_manager.snap_position(responses, document, input.mouse.position);
let keyboard = &input.keyboard;
responses.push_back(generate_transform(tool_data, keyboard.key(lock_angle), keyboard.key(snap_angle), keyboard.key(center)));
responses.add(generate_transform(tool_data, keyboard.key(lock_angle), keyboard.key(snap_angle), keyboard.key(center)));
Drawing
}
@@ -189,7 +189,7 @@ impl Fsm for LineToolFsmState {
}
(Drawing, Abort) => {
tool_data.snap_manager.cleanup(responses);
responses.push_back(DocumentMessage::AbortTransaction.into());
responses.add(DocumentMessage::AbortTransaction);
tool_data.path = None;
Ready
}
@@ -215,11 +215,11 @@ impl Fsm for LineToolFsmState {
])]),
};
responses.push_back(FrontendMessage::UpdateInputHints { hint_data }.into());
responses.add(FrontendMessage::UpdateInputHints { hint_data });
}
fn update_cursor(&self, responses: &mut VecDeque<Message>) {
responses.push_back(FrontendMessage::UpdateMouseCursor { cursor: MouseCursorIcon::Crosshair }.into());
responses.add(FrontendMessage::UpdateMouseCursor { cursor: MouseCursorIcon::Crosshair });
}
}
editor/src/messages/tool/tool_messages/navigate_tool.rs
+18 -21
View File
@@ -107,59 +107,56 @@ impl Fsm for NavigateToolFsmState {
tool_data: &mut Self::ToolData,
ToolActionHandlerData { input, .. }: &mut ToolActionHandlerData,
_tool_options: &Self::ToolOptions,
messages: &mut VecDeque<Message>,
responses: &mut VecDeque<Message>,
) -> Self {
if let ToolMessage::Navigate(navigate) = message {
use NavigateToolMessage::*;
match navigate {
ClickZoom { zoom_in } => {
messages.push_front(NavigationMessage::TransformCanvasEnd.into());
responses.add_front(NavigationMessage::TransformCanvasEnd);
// Mouse has not moved from pointerdown to pointerup
if tool_data.drag_start == input.mouse.position {
messages.push_front(if zoom_in {
NavigationMessage::IncreaseCanvasZoom { center_on_mouse: true }.into()
responses.add_front(if zoom_in {
NavigationMessage::IncreaseCanvasZoom { center_on_mouse: true }
} else {
NavigationMessage::DecreaseCanvasZoom { center_on_mouse: true }.into()
NavigationMessage::DecreaseCanvasZoom { center_on_mouse: true }
});
}
NavigateToolFsmState::Ready
}
PointerMove { snap_angle, snap_zoom } => {
messages.push_front(
NavigationMessage::PointerMove {
snap_angle,
wait_for_snap_angle_release: false,
snap_zoom,
zoom_from_viewport: Some(tool_data.drag_start),
}
.into(),
);
responses.add_front(NavigationMessage::PointerMove {
snap_angle,
wait_for_snap_angle_release: false,
snap_zoom,
zoom_from_viewport: Some(tool_data.drag_start),
});
self
}
TranslateCanvasBegin => {
tool_data.drag_start = input.mouse.position;
messages.push_front(NavigationMessage::TranslateCanvasBegin.into());
responses.add_front(NavigationMessage::TranslateCanvasBegin);
NavigateToolFsmState::Panning
}
RotateCanvasBegin => {
tool_data.drag_start = input.mouse.position;
messages.push_front(NavigationMessage::RotateCanvasBegin.into());
responses.add_front(NavigationMessage::RotateCanvasBegin);
NavigateToolFsmState::Tilting
}
ZoomCanvasBegin => {
tool_data.drag_start = input.mouse.position;
messages.push_front(NavigationMessage::ZoomCanvasBegin.into());
responses.add_front(NavigationMessage::ZoomCanvasBegin);
NavigateToolFsmState::Zooming
}
TransformCanvasEnd => {
messages.push_front(NavigationMessage::TransformCanvasEnd.into());
responses.add_front(NavigationMessage::TransformCanvasEnd);
NavigateToolFsmState::Ready
}
Abort => {
messages.push_front(NavigationMessage::TransformCanvasEnd.into());
responses.add_front(NavigationMessage::TransformCanvasEnd);
NavigateToolFsmState::Ready
}
}
@@ -181,7 +178,7 @@ impl Fsm for NavigateToolFsmState {
_ => HintData(Vec::new()),
};
responses.push_back(FrontendMessage::UpdateInputHints { hint_data }.into());
responses.add(FrontendMessage::UpdateInputHints { hint_data });
}
fn update_cursor(&self, responses: &mut VecDeque<Message>) {
@@ -192,6 +189,6 @@ impl Fsm for NavigateToolFsmState {
NavigateToolFsmState::Zooming => MouseCursorIcon::ZoomIn,
};
responses.push_back(FrontendMessage::UpdateMouseCursor { cursor }.into());
responses.add(FrontendMessage::UpdateMouseCursor { cursor });
}
}
editor/src/messages/tool/tool_messages/path_tool.rs
+10 -13
View File
@@ -183,7 +183,7 @@ impl Fsm for PathToolFsmState {
// Select the first point within the threshold (in pixels)
if let Some(mut selected_points) = shape_editor.select_point(&document.document_legacy, input.mouse.position, SELECTION_THRESHOLD, shift_pressed) {
responses.push_back(DocumentMessage::StartTransaction.into());
responses.add(DocumentMessage::StartTransaction);
tool_data
.snap_manager
@@ -224,16 +224,13 @@ impl Fsm for PathToolFsmState {
.intersects_quad_root(Quad::from_box([input.mouse.position - selection_size, input.mouse.position + selection_size]), render_data);
if !intersection.is_empty() {
if shift_pressed {
responses.push_back(DocumentMessage::AddSelectedLayers { additional_layers: intersection }.into());
responses.add(DocumentMessage::AddSelectedLayers { additional_layers: intersection });
} else {
// Selects the topmost layer when selecting intersecting shapes
let top_most_intersection = intersection[intersection.len() - 1].clone();
responses.push_back(
DocumentMessage::SetSelectedLayers {
replacement_selected_layers: vec![top_most_intersection.clone()],
}
.into(),
);
responses.add(DocumentMessage::SetSelectedLayers {
replacement_selected_layers: vec![top_most_intersection.clone()],
});
tool_data.drag_start_pos = input.mouse.position;
tool_data.previous_mouse_position = input.mouse.position;
// Selects all the anchor points when clicking in a filled area of shape. If two shapes intersect we pick the topmost layer.
@@ -243,7 +240,7 @@ impl Fsm for PathToolFsmState {
} else {
// Clear the previous selection if we didn't find anything
if !input.keyboard.get(shift_pressed as usize) {
responses.push_back(DocumentMessage::DeselectAllLayers.into());
responses.add(DocumentMessage::DeselectAllLayers);
}
}
@@ -312,9 +309,9 @@ impl Fsm for PathToolFsmState {
// Delete key
(_, PathToolMessage::Delete) => {
// Delete the selected points and clean up overlays
responses.push_back(DocumentMessage::StartTransaction.into());
responses.add(DocumentMessage::StartTransaction);
shape_editor.delete_selected_points(responses);
responses.push_back(PathToolMessage::SelectionChanged.into());
responses.add(PathToolMessage::SelectionChanged);
for layer_path in document.all_layers() {
shape_overlay.clear_subpath_overlays(&document.document_legacy, layer_path.to_vec(), responses);
}
@@ -367,10 +364,10 @@ impl Fsm for PathToolFsmState {
])]),
};
responses.push_back(FrontendMessage::UpdateInputHints { hint_data }.into());
responses.add(FrontendMessage::UpdateInputHints { hint_data });
}
fn update_cursor(&self, responses: &mut VecDeque<Message>) {
responses.push_back(FrontendMessage::UpdateMouseCursor { cursor: MouseCursorIcon::Default }.into());
responses.add(FrontendMessage::UpdateMouseCursor { cursor: MouseCursorIcon::Default });
}
}
editor/src/messages/tool/tool_messages/pen_tool.rs
+5 -5
View File
@@ -313,7 +313,7 @@ impl PenToolData {
modification: VectorDataModification::SetClosed { index: 0, closed: true },
});
responses.push_back(DocumentMessage::CommitTransaction.into());
responses.add(DocumentMessage::CommitTransaction);
// Clean up overlays
for layer_path in document.all_layers() {
@@ -329,7 +329,7 @@ impl PenToolData {
}
// Add a new manipulator for the next anchor that we will place
if let Some(out_handle) = outwards_handle.get_position(last_manipulator_group) {
responses.push_back(add_manipulator_group(&self.path, self.from_start, bezier_rs::ManipulatorGroup::new_anchor(out_handle)));
responses.add(add_manipulator_group(&self.path, self.from_start, bezier_rs::ManipulatorGroup::new_anchor(out_handle)));
}
Some(PenToolFsmState::PlacingAnchor)
@@ -524,7 +524,7 @@ impl Fsm for PenToolFsmState {
self
}
(PenToolFsmState::Ready, PenToolMessage::DragStart) => {
responses.push_back(DocumentMessage::StartTransaction.into());
responses.add(DocumentMessage::StartTransaction);
// Initialize snapping
tool_data.snap_manager.start_snap(document, input, document.bounding_boxes(None, None, render_data), true, true);
@@ -608,11 +608,11 @@ impl Fsm for PenToolFsmState {
]),
};
responses.push_back(FrontendMessage::UpdateInputHints { hint_data }.into());
responses.add(FrontendMessage::UpdateInputHints { hint_data });
}
fn update_cursor(&self, responses: &mut VecDeque<Message>) {
responses.push_back(FrontendMessage::UpdateMouseCursor { cursor: MouseCursorIcon::Default }.into());
responses.add(FrontendMessage::UpdateMouseCursor { cursor: MouseCursorIcon::Default });
}
}
editor/src/messages/tool/tool_messages/rectangle_tool.rs
+5 -5
View File
@@ -122,7 +122,7 @@ impl Fsm for RectangleToolFsmState {
let subpath = bezier_rs::Subpath::new_rect(DVec2::ZERO, DVec2::ONE);
let layer_path = document.get_path_for_new_layer();
responses.push_back(DocumentMessage::StartTransaction.into());
responses.add(DocumentMessage::StartTransaction);
shape_data.path = Some(layer_path.clone());
graph_modification_utils::new_vector_layer(vec![subpath], layer_path.clone(), responses);
responses.add(GraphOperationMessage::FillSet {
@@ -134,7 +134,7 @@ impl Fsm for RectangleToolFsmState {
}
(state, Resize { center, lock_ratio }) => {
if let Some(message) = shape_data.calculate_transform(responses, document, input, center, lock_ratio, false) {
responses.push_back(message);
responses.add(message);
}
state
@@ -146,7 +146,7 @@ impl Fsm for RectangleToolFsmState {
Ready
}
(Drawing, Abort) => {
responses.push_back(DocumentMessage::AbortTransaction.into());
responses.add(DocumentMessage::AbortTransaction);
shape_data.cleanup(responses);
@@ -169,10 +169,10 @@ impl Fsm for RectangleToolFsmState {
RectangleToolFsmState::Drawing => HintData(vec![HintGroup(vec![HintInfo::keys([Key::Shift], "Constrain Square"), HintInfo::keys([Key::Alt], "From Center")])]),
};
responses.push_back(FrontendMessage::UpdateInputHints { hint_data }.into());
responses.add(FrontendMessage::UpdateInputHints { hint_data });
}
fn update_cursor(&self, responses: &mut VecDeque<Message>) {
responses.push_back(FrontendMessage::UpdateMouseCursor { cursor: MouseCursorIcon::Crosshair }.into());
responses.add(FrontendMessage::UpdateMouseCursor { cursor: MouseCursorIcon::Crosshair });
}
}
editor/src/messages/tool/tool_messages/select_tool.rs
+101 -149
View File
@@ -248,7 +248,7 @@ impl<'a> MessageHandler<ToolMessage, &mut ToolActionHandlerData<'a>> for SelectT
fn process_message(&mut self, message: ToolMessage, responses: &mut VecDeque<Message>, tool_data: &mut ToolActionHandlerData<'a>) {
if let ToolMessage::Select(SelectToolMessage::SelectOptions(SelectOptionsUpdate::NestedSelectionBehavior(nested_selection_behavior))) = message {
self.tool_data.nested_selection_behavior = nested_selection_behavior;
responses.push_back(ToolMessage::UpdateHints.into());
responses.add(ToolMessage::UpdateHints);
}
self.fsm_state.process_event(message, &mut self.tool_data, tool_data, &(), responses, false);
@@ -336,7 +336,7 @@ impl SelectToolData {
/// Duplicates the currently dragging layers. Called when Alt is pressed and the layers have not yet been duplicated.
fn start_duplicates(&mut self, document: &DocumentMessageHandler, responses: &mut VecDeque<Message>) {
responses.push_back(DocumentMessage::DeselectAllLayers.into());
responses.add(DocumentMessage::DeselectAllLayers);
// Take the selected layers and store them in a separate list.
self.not_duplicated_layers = Some(self.layers_dragging.clone());
@@ -344,15 +344,12 @@ impl SelectToolData {
// Duplicate each previously selected layer and select the new ones.
for layer_path in Document::shallowest_unique_layers(self.layers_dragging.iter_mut()) {
// Moves the original back to its starting position.
responses.push_front(
GraphOperationMessage::TransformChange {
layer: layer_path.clone(),
transform: DAffine2::from_translation(self.drag_start - self.drag_current),
transform_in: TransformIn::Viewport,
skip_rerender: true,
}
.into(),
);
responses.add_front(GraphOperationMessage::TransformChange {
layer: layer_path.clone(),
transform: DAffine2::from_translation(self.drag_start - self.drag_current),
transform_in: TransformIn::Viewport,
skip_rerender: true,
});
// Copy the layers.
// Not using the Copy message allows us to retrieve the ids of the new layers to initialize the drag.
@@ -391,33 +388,27 @@ impl SelectToolData {
None => return,
};
responses.push_back(DocumentMessage::DeselectAllLayers.into());
responses.add(DocumentMessage::DeselectAllLayers);
// Delete the duplicated layers
for layer_path in Document::shallowest_unique_layers(self.layers_dragging.iter()) {
responses.push_back(Operation::DeleteLayer { path: layer_path.clone() }.into());
responses.add(Operation::DeleteLayer { path: layer_path.clone() });
}
// Move the original to under the mouse
for layer_path in Document::shallowest_unique_layers(originals.iter()) {
responses.push_front(
GraphOperationMessage::TransformChange {
layer: layer_path.clone(),
transform: DAffine2::from_translation(self.drag_current - self.drag_start),
transform_in: TransformIn::Viewport,
skip_rerender: true,
}
.into(),
);
responses.add_front(GraphOperationMessage::TransformChange {
layer: layer_path.clone(),
transform: DAffine2::from_translation(self.drag_current - self.drag_start),
transform_in: TransformIn::Viewport,
skip_rerender: true,
});
}
// Select the originals
responses.push_back(
DocumentMessage::SetSelectedLayers {
replacement_selected_layers: originals.clone(),
}
.into(),
);
responses.add(DocumentMessage::SetSelectedLayers {
replacement_selected_layers: originals.clone(),
});
self.layers_dragging = originals;
}
@@ -514,14 +505,14 @@ impl Fsm for SelectToolFsmState {
// If the user clicks on new shape, make that layer their new selection.
// Otherwise enter the box select mode
let state = if tool_data.pivot.is_over(input.mouse.position) {
responses.push_back(DocumentMessage::StartTransaction.into());
responses.add(DocumentMessage::StartTransaction);
tool_data.snap_manager.start_snap(document, input, document.bounding_boxes(None, None, render_data), true, true);
tool_data.snap_manager.add_all_document_handles(document, input, &[], &[], &[]);
DraggingPivot
} else if let Some(selected_edges) = dragging_bounds {
responses.push_back(DocumentMessage::StartTransaction.into());
responses.add(DocumentMessage::StartTransaction);
let snap_x = selected_edges.2 || selected_edges.3;
let snap_y = selected_edges.0 || selected_edges.1;
@@ -553,7 +544,7 @@ impl Fsm for SelectToolFsmState {
ResizingBounds
} else if rotating_bounds {
responses.push_back(DocumentMessage::StartTransaction.into());
responses.add(DocumentMessage::StartTransaction);
if let Some(bounds) = &mut tool_data.bounding_box_overlays {
let selected = selected.iter().collect::<Vec<_>>();
@@ -574,7 +565,7 @@ impl Fsm for SelectToolFsmState {
RotatingBounds
} else if intersection.last().map(|last| selected.contains(last)).unwrap_or(false) {
responses.push_back(DocumentMessage::StartTransaction.into());
responses.add(DocumentMessage::StartTransaction);
tool_data.layers_dragging = selected;
@@ -584,10 +575,10 @@ impl Fsm for SelectToolFsmState {
Dragging
} else {
responses.push_back(DocumentMessage::StartTransaction.into());
responses.add(DocumentMessage::StartTransaction);
if !input.keyboard.get(add_to_selection as usize) && tool_data.nested_selection_behavior == NestedSelectionBehavior::Deepest {
responses.push_back(DocumentMessage::DeselectAllLayers.into());
responses.add(DocumentMessage::DeselectAllLayers);
tool_data.layers_dragging.clear();
}
@@ -606,7 +597,7 @@ impl Fsm for SelectToolFsmState {
// Deselect all layers if using shallowest selection behavior
// Necessary since for shallowest mode, we need to know the current selected layers to determine the next
if tool_data.nested_selection_behavior == NestedSelectionBehavior::Shallowest {
responses.push_back(DocumentMessage::DeselectAllLayers.into());
responses.add(DocumentMessage::DeselectAllLayers);
tool_data.layers_dragging.clear();
}
tool_data.drag_box_overlay_layer = Some(add_bounding_box(responses));
@@ -620,7 +611,7 @@ impl Fsm for SelectToolFsmState {
(Dragging, PointerMove { axis_align, duplicate, .. }) => {
tool_data.is_dragging = true;
// TODO: This is a cheat. Break out the relevant functionality from the handler above and call it from there and here.
responses.push_front(SelectToolMessage::DocumentIsDirty.into());
responses.add_front(SelectToolMessage::DocumentIsDirty);
let mouse_position = axis_align_drag(input.keyboard.get(axis_align as usize), input.mouse.position, tool_data.drag_start);
@@ -636,15 +627,12 @@ impl Fsm for SelectToolFsmState {
let closest_move = tool_data.snap_manager.snap_layers(responses, document, snap, mouse_delta);
// TODO: Cache the result of `shallowest_unique_layers` to avoid this heavy computation every frame of movement, see https://github.com/GraphiteEditor/Graphite/pull/481
for path in Document::shallowest_unique_layers(tool_data.layers_dragging.iter()) {
responses.push_front(
GraphOperationMessage::TransformChange {
layer: path.to_vec(),
transform: DAffine2::from_translation(mouse_delta + closest_move),
transform_in: TransformIn::Viewport,
skip_rerender: true,
}
.into(),
);
responses.add_front(GraphOperationMessage::TransformChange {
layer: path.to_vec(),
transform: DAffine2::from_translation(mouse_delta + closest_move),
transform_in: TransformIn::Viewport,
skip_rerender: true,
});
}
tool_data.drag_current = mouse_position + closest_move;
@@ -720,16 +708,13 @@ impl Fsm for SelectToolFsmState {
(DrawingBox, PointerMove { .. }) => {
tool_data.drag_current = input.mouse.position;
responses.push_front(
DocumentMessage::Overlays(
Operation::SetLayerTransformInViewport {
path: tool_data.drag_box_overlay_layer.clone().unwrap(),
transform: transform_from_box(tool_data.drag_start, tool_data.drag_current, DAffine2::IDENTITY).to_cols_array(),
}
.into(),
)
responses.add_front(DocumentMessage::Overlays(
Operation::SetLayerTransformInViewport {
path: tool_data.drag_box_overlay_layer.clone().unwrap(),
transform: transform_from_box(tool_data.drag_start, tool_data.drag_current, DAffine2::IDENTITY).to_cols_array(),
}
.into(),
);
));
DrawingBox
}
(Ready, PointerMove { .. }) => {
@@ -749,7 +734,7 @@ impl Fsm for SelectToolFsmState {
if tool_data.cursor != cursor {
tool_data.cursor = cursor;
responses.push_back(FrontendMessage::UpdateMouseCursor { cursor }.into());
responses.add(FrontendMessage::UpdateMouseCursor { cursor });
}
Ready
@@ -762,7 +747,7 @@ impl Fsm for SelectToolFsmState {
false => DocumentMessage::CommitTransaction,
};
tool_data.snap_manager.cleanup(responses);
responses.push_front(response.into());
responses.add_front(response);
Ready
}
@@ -782,14 +767,14 @@ impl Fsm for SelectToolFsmState {
tool_data.layers_dragging.clear();
tool_data.layers_dragging.append(replacement_selected_layers.clone().as_mut());
responses.push_back(DocumentMessage::SetSelectedLayers { replacement_selected_layers }.into());
responses.add(DocumentMessage::SetSelectedLayers { replacement_selected_layers });
}
}
tool_data.is_dragging = false;
tool_data.layer_selected_on_start = None;
responses.push_back(DocumentMessage::CommitTransaction.into());
responses.add(DocumentMessage::CommitTransaction);
tool_data.snap_manager.cleanup(responses);
Ready
@@ -801,7 +786,7 @@ impl Fsm for SelectToolFsmState {
true => DocumentMessage::Undo,
false => DocumentMessage::CommitTransaction,
};
responses.push_back(response.into());
responses.add(response);
tool_data.snap_manager.cleanup(responses);
@@ -818,7 +803,7 @@ impl Fsm for SelectToolFsmState {
true => DocumentMessage::Undo,
false => DocumentMessage::CommitTransaction,
};
responses.push_back(response.into());
responses.add(response);
if let Some(bounds) = &mut tool_data.bounding_box_overlays {
bounds.original_transforms.clear();
@@ -831,7 +816,7 @@ impl Fsm for SelectToolFsmState {
true => DocumentMessage::Undo,
false => DocumentMessage::CommitTransaction,
};
responses.push_back(response.into());
responses.add(response);
tool_data.snap_manager.cleanup(responses);
@@ -839,21 +824,15 @@ impl Fsm for SelectToolFsmState {
}
(DrawingBox, DragStop { .. } | Enter) => {
let quad = tool_data.selection_quad();
responses.push_front(
DocumentMessage::AddSelectedLayers {
additional_layers: document.document_legacy.intersects_quad_root(quad, render_data),
responses.add_front(DocumentMessage::AddSelectedLayers {
additional_layers: document.document_legacy.intersects_quad_root(quad, render_data),
});
responses.add_front(DocumentMessage::Overlays(
Operation::DeleteLayer {
path: tool_data.drag_box_overlay_layer.take().unwrap(),
}
.into(),
);
responses.push_front(
DocumentMessage::Overlays(
Operation::DeleteLayer {
path: tool_data.drag_box_overlay_layer.take().unwrap(),
}
.into(),
)
.into(),
);
));
Ready
}
(Ready, Enter) => {
@@ -865,8 +844,8 @@ impl Fsm for SelectToolFsmState {
if let Ok(layer) = document.document_legacy.layer(layer_path) {
if let Ok(network) = layer.as_node_graph() {
if network.nodes.values().any(|node| node.name == "Text") {
responses.push_front(ToolMessage::ActivateTool { tool_type: ToolType::Text }.into());
responses.push_back(TextToolMessage::EditSelected.into());
responses.add_front(ToolMessage::ActivateTool { tool_type: ToolType::Text });
responses.add(TextToolMessage::EditSelected);
}
}
}
@@ -879,7 +858,7 @@ impl Fsm for SelectToolFsmState {
rerender_selected_layers(tool_data, responses);
tool_data.snap_manager.cleanup(responses);
responses.push_back(DocumentMessage::Undo.into());
responses.add(DocumentMessage::Undo);
tool_data.path_outlines.clear_selected(responses);
tool_data.pivot.clear_overlays(responses);
@@ -888,7 +867,7 @@ impl Fsm for SelectToolFsmState {
}
(_, Abort) => {
if let Some(path) = tool_data.drag_box_overlay_layer.take() {
responses.push_front(DocumentMessage::Overlays(Operation::DeleteLayer { path }.into()).into())
responses.add_front(DocumentMessage::Overlays(Operation::DeleteLayer { path }.into()))
};
if let Some(mut bounding_box_overlays) = tool_data.bounding_box_overlays.take() {
let selected = tool_data.layers_dragging.iter().collect::<Vec<_>>();
@@ -915,22 +894,22 @@ impl Fsm for SelectToolFsmState {
Ready
}
(_, Align { axis, aggregate }) => {
responses.push_back(DocumentMessage::AlignSelectedLayers { axis, aggregate }.into());
responses.add(DocumentMessage::AlignSelectedLayers { axis, aggregate });
self
}
(_, FlipHorizontal) => {
responses.push_back(DocumentMessage::FlipSelectedLayers { flip_axis: FlipAxis::X }.into());
responses.add(DocumentMessage::FlipSelectedLayers { flip_axis: FlipAxis::X });
self
}
(_, FlipVertical) => {
responses.push_back(DocumentMessage::FlipSelectedLayers { flip_axis: FlipAxis::Y }.into());
responses.add(DocumentMessage::FlipSelectedLayers { flip_axis: FlipAxis::Y });
self
}
(_, SetPivot { position }) => {
responses.push_back(DocumentMessage::StartTransaction.into());
responses.add(DocumentMessage::StartTransaction);
let pos: Option<DVec2> = position.into();
tool_data.pivot.set_normalized_position(pos.unwrap(), document, render_data, responses);
@@ -944,7 +923,7 @@ impl Fsm for SelectToolFsmState {
}
}
fn standard_tool_messages(&self, message: &ToolMessage, messages: &mut VecDeque<Message>, tool_data: &mut Self::ToolData) -> bool {
fn standard_tool_messages(&self, message: &ToolMessage, responses: &mut VecDeque<Message>, tool_data: &mut Self::ToolData) -> bool {
// Check for standard hits or cursor events
match message {
ToolMessage::UpdateHints => {
@@ -974,12 +953,12 @@ impl Fsm for SelectToolFsmState {
]),
]);
messages.push_back(FrontendMessage::UpdateInputHints { hint_data }.into());
self.update_hints(messages);
responses.add(FrontendMessage::UpdateInputHints { hint_data });
self.update_hints(responses);
true
}
ToolMessage::UpdateCursor => {
self.update_cursor(messages);
self.update_cursor(responses);
true
}
_ => false,
@@ -989,7 +968,7 @@ impl Fsm for SelectToolFsmState {
fn update_hints(&self, _responses: &mut VecDeque<Message>) {}
fn update_cursor(&self, responses: &mut VecDeque<Message>) {
responses.push_back(FrontendMessage::UpdateMouseCursor { cursor: MouseCursorIcon::Default }.into());
responses.add(FrontendMessage::UpdateMouseCursor { cursor: MouseCursorIcon::Default });
}
}
@@ -1023,13 +1002,13 @@ fn drag_shallowest_manipulation(
if layers.contains(&&[incoming_parent].as_slice()) {
// Add incoming layer
tool_data.layers_dragging.clear();
responses.push_back(DocumentMessage::DeselectAllLayers.into());
responses.add(DocumentMessage::DeselectAllLayers);
layers_without_incoming_parent.append(selected.clone().as_mut());
*selected = layers_without_incoming_parent;
}
tool_data.layers_dragging.append(selected.clone().as_mut());
responses.push_back(DocumentMessage::AddSelectedLayers { additional_layers: selected.clone() }.into());
responses.add(DocumentMessage::AddSelectedLayers { additional_layers: selected.clone() });
return;
}
@@ -1037,12 +1016,9 @@ fn drag_shallowest_manipulation(
if input.keyboard.get(select_deepest as usize) {
tool_data.layers_dragging.clear();
tool_data.layers_dragging.append(selected.clone().as_mut());
responses.push_back(
DocumentMessage::SetSelectedLayers {
replacement_selected_layers: selected.clone(),
}
.into(),
);
responses.add(DocumentMessage::SetSelectedLayers {
replacement_selected_layers: selected.clone(),
});
return;
}
@@ -1094,23 +1070,17 @@ fn drag_shallowest_manipulation(
if selected_layers_count <= 1 {
if input.keyboard.get(add_to_selection as usize) {
if !already_selected {
responses.push_back(
DocumentMessage::AddSelectedLayers {
additional_layers: vec![search.clone()],
}
.into(),
);
responses.add(DocumentMessage::AddSelectedLayers {
additional_layers: vec![search.clone()],
});
} else {
tool_data.layer_selected_on_start = None;
}
} else {
tool_data.layers_dragging.clear();
responses.push_back(
DocumentMessage::SetSelectedLayers {
replacement_selected_layers: vec![search.clone()],
}
.into(),
);
responses.add(DocumentMessage::SetSelectedLayers {
replacement_selected_layers: vec![search.clone()],
});
}
tool_data.layers_dragging.push(search);
} else {
@@ -1131,23 +1101,17 @@ fn drag_shallowest_manipulation(
if input.keyboard.get(add_to_selection as usize) {
if !already_selected {
tool_data.layers_dragging.push(direct_child.clone());
responses.push_back(
DocumentMessage::AddSelectedLayers {
additional_layers: vec![direct_child.clone()],
}
.into(),
);
responses.add(DocumentMessage::AddSelectedLayers {
additional_layers: vec![direct_child.clone()],
});
} else {
tool_data.layer_selected_on_start = None;
}
} else {
tool_data.layers_dragging.push(direct_child.clone());
responses.push_back(
DocumentMessage::SetSelectedLayers {
replacement_selected_layers: vec![direct_child.clone()],
}
.into(),
);
responses.add(DocumentMessage::SetSelectedLayers {
replacement_selected_layers: vec![direct_child.clone()],
});
}
}
}
@@ -1155,20 +1119,14 @@ fn drag_shallowest_manipulation(
else {
let parent_folder_id = selected.first().unwrap().first().unwrap();
if input.keyboard.get(add_to_selection as usize) {
responses.push_back(
DocumentMessage::AddSelectedLayers {
additional_layers: vec![vec![*parent_folder_id]],
}
.into(),
);
responses.add(DocumentMessage::AddSelectedLayers {
additional_layers: vec![vec![*parent_folder_id]],
});
} else {
tool_data.layers_dragging.clear();
responses.push_back(
DocumentMessage::SetSelectedLayers {
replacement_selected_layers: vec![vec![*parent_folder_id]],
}
.into(),
);
responses.add(DocumentMessage::SetSelectedLayers {
replacement_selected_layers: vec![vec![*parent_folder_id]],
});
}
tool_data.layers_dragging.push(vec![*parent_folder_id]);
}
@@ -1176,12 +1134,9 @@ fn drag_shallowest_manipulation(
// Check if new layer is already selected
let parent_folder_id = selected.first().unwrap().first().unwrap();
tool_data.layers_dragging.push(vec![*parent_folder_id]);
responses.push_back(
DocumentMessage::AddSelectedLayers {
additional_layers: vec![vec![*parent_folder_id]],
}
.into(),
);
responses.add(DocumentMessage::AddSelectedLayers {
additional_layers: vec![vec![*parent_folder_id]],
});
}
}
@@ -1193,7 +1148,7 @@ fn drag_deepest_manipulation(
input: &InputPreprocessorMessageHandler,
render_data: &document_legacy::layers::RenderData,
) {
responses.push_back(DocumentMessage::AddSelectedLayers { additional_layers: selected.clone() }.into());
responses.add(DocumentMessage::AddSelectedLayers { additional_layers: selected.clone() });
tool_data.layers_dragging.append(selected.as_mut());
tool_data
.snap_manager
@@ -1237,14 +1192,11 @@ fn edit_layer_shallowest_manipulation(document: &DocumentMessageHandler, interse
if !selected_layers.contains(&new_layer_path.as_slice()) {
tool_data.layers_dragging.clear();
tool_data.layers_dragging.push(new_layer_path.clone());
responses.push_back(
DocumentMessage::SetSelectedLayers {
replacement_selected_layers: vec![new_layer_path],
}
.into(),
);
responses.add(DocumentMessage::SetSelectedLayers {
replacement_selected_layers: vec![new_layer_path],
});
} else {
responses.push_front(ToolMessage::ActivateTool { tool_type: ToolType::Path }.into());
responses.add_front(ToolMessage::ActivateTool { tool_type: ToolType::Path });
}
}
}
@@ -1252,14 +1204,14 @@ fn edit_layer_shallowest_manipulation(document: &DocumentMessageHandler, interse
fn edit_layer_deepest_manipulation(intersect: &Layer, responses: &mut VecDeque<Message>) {
match &intersect.data {
LayerDataType::Shape(_) => {
responses.push_front(ToolMessage::ActivateTool { tool_type: ToolType::Path }.into());
responses.add_front(ToolMessage::ActivateTool { tool_type: ToolType::Path });
}
LayerDataType::NodeGraphFrame(graph_frame) if graph_frame.as_vector_data().is_some() => {
if graph_frame.network.nodes.values().any(|node| node.name == "Text") {
responses.push_front(ToolMessage::ActivateTool { tool_type: ToolType::Text }.into());
responses.push_back(TextToolMessage::EditSelected.into());
responses.add_front(ToolMessage::ActivateTool { tool_type: ToolType::Text });
responses.add(TextToolMessage::EditSelected);
} else {
responses.push_front(ToolMessage::ActivateTool { tool_type: ToolType::Path }.into());
responses.add_front(ToolMessage::ActivateTool { tool_type: ToolType::Path });
}
}
_ => {}
editor/src/messages/tool/tool_messages/shape_tool.rs
+5 -5
View File
@@ -157,7 +157,7 @@ impl Fsm for ShapeToolFsmState {
match (self, event) {
(Ready, DragStart) => {
shape_data.start(responses, document, input, render_data);
responses.push_back(DocumentMessage::StartTransaction.into());
responses.add(DocumentMessage::StartTransaction);
let layer_path = document.get_path_for_new_layer();
shape_data.path = Some(layer_path.clone());
tool_data.sides = tool_options.vertices;
@@ -173,7 +173,7 @@ impl Fsm for ShapeToolFsmState {
}
(state, Resize { center, lock_ratio }) => {
if let Some(message) = shape_data.calculate_transform(responses, document, input, center, lock_ratio, false) {
responses.push_back(message);
responses.add(message);
}
state
@@ -185,7 +185,7 @@ impl Fsm for ShapeToolFsmState {
Ready
}
(Drawing, Abort) => {
responses.push_back(DocumentMessage::AbortTransaction.into());
responses.add(DocumentMessage::AbortTransaction);
shape_data.cleanup(responses);
@@ -208,10 +208,10 @@ impl Fsm for ShapeToolFsmState {
ShapeToolFsmState::Drawing => HintData(vec![HintGroup(vec![HintInfo::keys([Key::Shift], "Constrain 1:1 Aspect"), HintInfo::keys([Key::Alt], "From Center")])]),
};
responses.push_back(FrontendMessage::UpdateInputHints { hint_data }.into());
responses.add(FrontendMessage::UpdateInputHints { hint_data });
}
fn update_cursor(&self, responses: &mut VecDeque<Message>) {
responses.push_back(FrontendMessage::UpdateMouseCursor { cursor: MouseCursorIcon::Crosshair }.into());
responses.add(FrontendMessage::UpdateMouseCursor { cursor: MouseCursorIcon::Crosshair });
}
}
editor/src/messages/tool/tool_messages/spline_tool.rs
+9 -9
View File
@@ -164,8 +164,8 @@ impl Fsm for SplineToolFsmState {
if let ToolMessage::Spline(event) = event {
match (self, event) {
(Ready, DragStart) => {
responses.push_back(DocumentMessage::StartTransaction.into());
responses.push_back(DocumentMessage::DeselectAllLayers.into());
responses.add(DocumentMessage::StartTransaction);
responses.add(DocumentMessage::DeselectAllLayers);
tool_data.path = Some(document.get_path_for_new_layer());
tool_data.snap_manager.start_snap(document, input, document.bounding_boxes(None, None, render_data), true, true);
@@ -194,7 +194,7 @@ impl Fsm for SplineToolFsmState {
}
}
responses.push_back(remove_preview(tool_data));
responses.add(remove_preview(tool_data));
add_spline(tool_data, global_tool_data, true, responses);
Drawing
@@ -204,18 +204,18 @@ impl Fsm for SplineToolFsmState {
let pos = transform.inverse().transform_point2(snapped_position);
tool_data.next_point = pos;
responses.push_back(remove_preview(tool_data));
responses.add(remove_preview(tool_data));
add_spline(tool_data, global_tool_data, true, responses);
Drawing
}
(Drawing, Confirm) | (Drawing, Abort) => {
if tool_data.points.len() >= 2 {
responses.push_back(remove_preview(tool_data));
responses.add(remove_preview(tool_data));
add_spline(tool_data, global_tool_data, false, responses);
responses.push_back(DocumentMessage::CommitTransaction.into());
responses.add(DocumentMessage::CommitTransaction);
} else {
responses.push_back(DocumentMessage::AbortTransaction.into());
responses.add(DocumentMessage::AbortTransaction);
}
tool_data.path = None;
@@ -240,11 +240,11 @@ impl Fsm for SplineToolFsmState {
]),
};
responses.push_back(FrontendMessage::UpdateInputHints { hint_data }.into());
responses.add(FrontendMessage::UpdateInputHints { hint_data });
}
fn update_cursor(&self, responses: &mut VecDeque<Message>) {
responses.push_back(FrontendMessage::UpdateMouseCursor { cursor: MouseCursorIcon::Default }.into());
responses.add(FrontendMessage::UpdateMouseCursor { cursor: MouseCursorIcon::Default });
}
}
editor/src/messages/tool/transform_layer/transform_layer_message_handler.rs
+3 -3
View File
@@ -125,7 +125,7 @@ impl<'a> MessageHandler<TransformLayerMessage, TransformData<'a>> for TransformL
self.transform_operation = TransformOperation::Grabbing(Default::default());
selected.original_transforms.clear();
responses.push_back(BroadcastEvent::DocumentIsDirty.into());
responses.add(BroadcastEvent::DocumentIsDirty);
}
BeginRotate => {
if let TransformOperation::Rotating(_) = self.transform_operation {
@@ -142,7 +142,7 @@ impl<'a> MessageHandler<TransformLayerMessage, TransformData<'a>> for TransformL
self.transform_operation = TransformOperation::Rotating(Default::default());
selected.original_transforms.clear();
responses.push_back(BroadcastEvent::DocumentIsDirty.into());
responses.add(BroadcastEvent::DocumentIsDirty);
}
BeginScale => {
if let TransformOperation::Scaling(_) = self.transform_operation {
@@ -159,7 +159,7 @@ impl<'a> MessageHandler<TransformLayerMessage, TransformData<'a>> for TransformL
self.transform_operation = TransformOperation::Scaling(Default::default());
selected.original_transforms.clear();
responses.push_back(BroadcastEvent::DocumentIsDirty.into());
responses.add(BroadcastEvent::DocumentIsDirty);
}
CancelTransformOperation => {
selected.revert_operation();
editor/src/messages/tool/utility_types.rs
+22 -31
View File
@@ -72,7 +72,7 @@ pub trait Fsm {
/// For example, if the tool's FSM is in a `Ready` state and receives a `DragStart` message as its event, it may decide to send some messages,
/// update some internal tool variables, and end by transitioning to a `Drawing` state.
#[must_use]
fn transition(self, message: ToolMessage, tool_data: &mut Self::ToolData, transition_data: &mut ToolActionHandlerData, options: &Self::ToolOptions, messages: &mut VecDeque<Message>) -> Self;
fn transition(self, message: ToolMessage, tool_data: &mut Self::ToolData, transition_data: &mut ToolActionHandlerData, options: &Self::ToolOptions, responses: &mut VecDeque<Message>) -> Self;
/// Implementing this trait function lets a specific tool provide a list of hints (user input actions presently available) to draw in the footer bar.
fn update_hints(&self, responses: &mut VecDeque<Message>);
@@ -80,15 +80,15 @@ pub trait Fsm {
fn update_cursor(&self, responses: &mut VecDeque<Message>);
/// If this message is a standard tool message, process it and return true. Standard tool messages are those which are common across every tool.
fn standard_tool_messages(&self, message: &ToolMessage, messages: &mut VecDeque<Message>, _tool_data: &mut Self::ToolData) -> bool {
fn standard_tool_messages(&self, message: &ToolMessage, responses: &mut VecDeque<Message>, _tool_data: &mut Self::ToolData) -> bool {
// Check for standard hits or cursor events
match message {
ToolMessage::UpdateHints => {
self.update_hints(messages);
self.update_hints(responses);
true
}
ToolMessage::UpdateCursor => {
self.update_cursor(messages);
self.update_cursor(responses);
true
}
_ => false,
@@ -103,25 +103,25 @@ pub trait Fsm {
tool_data: &mut Self::ToolData,
transition_data: &mut ToolActionHandlerData,
options: &Self::ToolOptions,
messages: &mut VecDeque<Message>,
responses: &mut VecDeque<Message>,
update_cursor_on_transition: bool,
) where
Self: PartialEq + Sized + Copy,
{
// If this message is one of the standard tool messages, process it and exit early
if self.standard_tool_messages(&message, messages, tool_data) {
if self.standard_tool_messages(&message, responses, tool_data) {
return;
}
// Transition the tool
let new_state = self.transition(message, tool_data, transition_data, options, messages);
let new_state = self.transition(message, tool_data, transition_data, options, responses);
// Update state
if *self != new_state {
*self = new_state;
self.update_hints(messages);
self.update_hints(responses);
if update_cursor_on_transition {
self.update_cursor(messages);
self.update_cursor(responses);
}
}
}
@@ -164,15 +164,12 @@ impl DocumentToolData {
},
]);
responses.push_back(
LayoutMessage::SendLayout {
layout: Layout::WidgetLayout(layout),
layout_target: LayoutTarget::WorkingColors,
}
.into(),
);
responses.add(LayoutMessage::SendLayout {
layout: Layout::WidgetLayout(layout),
layout_target: LayoutTarget::WorkingColors,
});
responses.push_back(EyedropperToolMessage::PointerMove.into());
responses.add(EyedropperToolMessage::PointerMove);
}
}
@@ -189,13 +186,10 @@ pub trait ToolTransition {
fn activate(&self, responses: &mut VecDeque<Message>) {
let mut subscribe_message = |broadcast_to_tool_mapping: Option<ToolMessage>, event: BroadcastEvent| {
if let Some(mapping) = broadcast_to_tool_mapping {
responses.push_back(
BroadcastMessage::SubscribeEvent {
on: event,
send: Box::new(mapping.into()),
}
.into(),
);
responses.add(BroadcastMessage::SubscribeEvent {
on: event,
send: Box::new(mapping.into()),
});
};
};
@@ -208,13 +202,10 @@ pub trait ToolTransition {
fn deactivate(&self, responses: &mut VecDeque<Message>) {
let mut unsubscribe_message = |broadcast_to_tool_mapping: Option<ToolMessage>, event: BroadcastEvent| {
if let Some(mapping) = broadcast_to_tool_mapping {
responses.push_back(
BroadcastMessage::UnsubscribeEvent {
on: event,
message: Box::new(mapping.into()),
}
.into(),
);
responses.add(BroadcastMessage::UnsubscribeEvent {
on: event,
message: Box::new(mapping.into()),
});
};
};