mirror of
https://github.com/GraphiteEditor/Graphite.git
synced 2026-10-02 06:28:11 +08:00
Merge branch 'master' into grid_shape
This commit is contained in:
@@ -532,7 +532,7 @@ struct PathToolData {
|
|||||||
drill_through_cycle_index: usize,
|
drill_through_cycle_index: usize,
|
||||||
drill_through_cycle_count: usize,
|
drill_through_cycle_count: usize,
|
||||||
hovered_layers: Vec<LayerNodeIdentifier>,
|
hovered_layers: Vec<LayerNodeIdentifier>,
|
||||||
ghost_outline: Vec<(Vec<ClickTargetType>, DAffine2)>,
|
ghost_outline: Vec<(Vec<ClickTargetType>, LayerNodeIdentifier)>,
|
||||||
single_path_node_compatible_layer_selected: bool,
|
single_path_node_compatible_layer_selected: bool,
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -628,8 +628,8 @@ impl PathToolData {
|
|||||||
for &layer in shape_editor.selected_shape_state.keys() {
|
for &layer in shape_editor.selected_shape_state.keys() {
|
||||||
// We probably need to collect here
|
// We probably need to collect here
|
||||||
let outline: Vec<ClickTargetType> = document.metadata().layer_with_free_points_outline(layer).cloned().collect();
|
let outline: Vec<ClickTargetType> = document.metadata().layer_with_free_points_outline(layer).cloned().collect();
|
||||||
let transform = document.metadata().transform_to_viewport(layer);
|
|
||||||
self.ghost_outline.push((outline, transform));
|
self.ghost_outline.push((outline, layer));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1490,8 +1490,9 @@ impl Fsm for PathToolFsmState {
|
|||||||
}
|
}
|
||||||
(_, PathToolMessage::Overlays(mut overlay_context)) => {
|
(_, PathToolMessage::Overlays(mut overlay_context)) => {
|
||||||
if matches!(self, Self::Dragging(_)) {
|
if matches!(self, Self::Dragging(_)) {
|
||||||
for (outline, transform) in &tool_data.ghost_outline {
|
for (outline, layer) in &tool_data.ghost_outline {
|
||||||
overlay_context.outline(outline.iter(), *transform, Some(COLOR_OVERLAY_GRAY));
|
let transform = document.metadata().transform_to_viewport(*layer);
|
||||||
|
overlay_context.outline(outline.iter(), transform, Some(COLOR_OVERLAY_GRAY));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user