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

Comprehensively polish up the input hints across all tools and states (#1670)

Browse Source 
* Add missing keyhints to most tools

* Standardize hints further

* Improve GRS numerical display values

* Additional hints improvements

* Improve Path tool hints; add Ctrl+Shift+A point deselection

---------

Co-authored-by: Keavon Chambers <keavon@keavon.com>
This commit is contained in:
milan-sedivy
2024-03-12 20:20:25 -07:00
committed by GitHub
co-authored by Keavon Chambers
parent 2263b0ab89
commit 9ac10cdcf8
18 changed files with 218 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files
editor/src/messages/tool/common_functionality/shape_editor.rs
+36 -29
View File
@@ -318,15 +318,6 @@ impl ShapeState {
document.metadata.document_to_viewport.transform_vector2(offset)
}
pub fn select_anchor_point_by_id(&mut self, layer: LayerNodeIdentifier, id: ManipulatorGroupId, add_to_selection: bool) {
if !add_to_selection {
self.deselect_all();
}
let point = ManipulatorPointId::new(id, SelectedType::Anchor);
let Some(selected_state) = self.selected_shape_state.get_mut(&layer) else { return };
selected_state.select_point(point);
}
/// Select/deselect the first point within the selection threshold.
/// Returns a tuple of the points if found and the offset, or `None` otherwise.
pub fn change_point_selection(
@@ -359,7 +350,7 @@ impl ShapeState {
if new_selected {
let retain_existing_selection = add_to_selection || already_selected;
if !retain_existing_selection {
self.deselect_all();
self.deselect_all_points();
}
// Add to the selected points
@@ -383,20 +374,43 @@ impl ShapeState {
None
}
pub fn select_all_points(&mut self, document_network: &NodeNetwork) {
for (layer, state) in self.selected_shape_state.iter_mut() {
let Some(subpaths) = get_subpaths(*layer, document_network) else { return };
for manipulator in get_manipulator_groups(subpaths) {
state.select_point(ManipulatorPointId::new(manipulator.id, SelectedType::Anchor));
for selected_type in &[SelectedType::InHandle, SelectedType::OutHandle] {
state.deselect_point(ManipulatorPointId::new(manipulator.id, *selected_type));
}
}
pub fn select_anchor_point_by_id(&mut self, layer: LayerNodeIdentifier, id: ManipulatorGroupId, add_to_selection: bool) {
if !add_to_selection {
self.deselect_all_points();
}
let point = ManipulatorPointId::new(id, SelectedType::Anchor);
let Some(selected_state) = self.selected_shape_state.get_mut(&layer) else { return };
selected_state.select_point(point);
}
/// Selects all anchors, and deselects all handles, for the given layer.
pub fn select_all_anchors_in_layer(&mut self, document_network: &NodeNetwork, layer: LayerNodeIdentifier) {
let Some(state) = self.selected_shape_state.get_mut(&layer) else { return };
Self::select_all_anchors_in_layer_with_state(document_network, layer, state);
}
/// Selects all anchors, and deselects all handles, for the selected layers.
pub fn select_all_anchors_in_selected_layers(&mut self, document_network: &NodeNetwork) {
for (&layer, state) in self.selected_shape_state.iter_mut() {
Self::select_all_anchors_in_layer_with_state(document_network, layer, state);
}
}
pub fn deselect_all(&mut self) {
self.selected_shape_state.values_mut().for_each(|state| state.selected_points.clear());
/// Internal helper function that selects all anchors, and deselects all handles, for a layer given its [`LayerNodeIdentifier`] and [`SelectedLayerState`].
fn select_all_anchors_in_layer_with_state(document_network: &NodeNetwork, layer: LayerNodeIdentifier, state: &mut SelectedLayerState) {
let Some(subpaths) = get_subpaths(layer, document_network) else { return };
for manipulator in get_manipulator_groups(subpaths) {
state.select_point(ManipulatorPointId::new(manipulator.id, SelectedType::Anchor));
state.deselect_point(ManipulatorPointId::new(manipulator.id, SelectedType::InHandle));
state.deselect_point(ManipulatorPointId::new(manipulator.id, SelectedType::OutHandle));
}
}
/// Deselects all points (anchors and handles) across every selected layer.
pub fn deselect_all_points(&mut self) {
for state in self.selected_shape_state.values_mut() {
state.selected_points.clear()
}
}
/// Set the shapes we consider for selection, we will choose draggable manipulators from these shapes.
@@ -407,6 +421,7 @@ impl ShapeState {
}
}
/// Returns an iterator over the currently selected layers to get their [`LayerNodeIdentifier`]s.
pub fn selected_layers(&self) -> impl Iterator<Item = &LayerNodeIdentifier> {
self.selected_shape_state.keys()
}
@@ -427,14 +442,6 @@ impl ShapeState {
self.iter(document_network).flat_map(|subpaths| get_manipulator_groups(subpaths))
}
pub fn select_all_anchors(&mut self, document_network: &NodeNetwork, layer: LayerNodeIdentifier) {
let Some(subpaths) = get_subpaths(layer, document_network) else { return };
let Some(state) = self.selected_shape_state.get_mut(&layer) else { return };
for manipulator in get_manipulator_groups(subpaths) {
state.select_point(ManipulatorPointId::new(manipulator.id, SelectedType::Anchor))
}
}
/// Provide the currently selected points by reference.
pub fn selected_points(&self) -> impl Iterator<Item = &'_ ManipulatorPointId> {
self.selected_shape_state.values().flat_map(|state| &state.selected_points)