From 5c98378c7a73e199f36937d94af0e8e4eea1808c Mon Sep 17 00:00:00 2001 From: fiveeyy <118456685+faisalill@users.noreply.github.com> Date: Mon, 14 Oct 2024 02:49:46 +0530 Subject: [PATCH] Fix Ctrl+H layer hiding and Ctrl+L layer locking only working with the graph open (#2029) * Add DocumentMessage::ToggleSelectedVisibility * Add DocumentMessage::ToggleSelectedLocked * Update editor/src/messages/input_mapper/input_mappings.rs --------- Co-authored-by: Keavon Chambers --- editor/src/messages/input_mapper/input_mappings.rs | 4 ++-- editor/src/messages/portfolio/document/document_message.rs | 2 ++ .../messages/portfolio/document/document_message_handler.rs | 6 ++++++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/editor/src/messages/input_mapper/input_mappings.rs b/editor/src/messages/input_mapper/input_mappings.rs index e16ed2f3..bccaadef 100644 --- a/editor/src/messages/input_mapper/input_mappings.rs +++ b/editor/src/messages/input_mapper/input_mappings.rs @@ -69,8 +69,6 @@ pub fn input_mappings() -> Mapping { entry!(KeyDown(KeyX); modifiers=[Accel], action_dispatch=NodeGraphMessage::Cut), entry!(KeyDown(KeyC); modifiers=[Accel], action_dispatch=NodeGraphMessage::Copy), entry!(KeyDown(KeyD); modifiers=[Accel], action_dispatch=NodeGraphMessage::DuplicateSelectedNodes), - entry!(KeyDown(KeyH); modifiers=[Accel], action_dispatch=NodeGraphMessage::ToggleSelectedVisibility), - entry!(KeyDown(KeyL); modifiers=[Accel], action_dispatch=NodeGraphMessage::ToggleSelectedLocked), entry!(KeyDown(KeyL); modifiers=[Alt], action_dispatch=NodeGraphMessage::ToggleSelectedAsLayersOrNodes), entry!(KeyDown(KeyC); modifiers=[Shift], action_dispatch=NodeGraphMessage::PrintSelectedNodeCoordinates), entry!(KeyDown(KeyC); modifiers=[Alt], action_dispatch=NodeGraphMessage::SendClickTargets), @@ -311,6 +309,8 @@ pub fn input_mappings() -> Mapping { entry!(KeyDown(KeyP); modifiers=[Alt], action_dispatch=DocumentMessage::DebugPrintDocument), entry!(KeyDown(KeyO); modifiers=[Alt], action_dispatch=DocumentMessage::ToggleOverlaysVisibility), entry!(KeyDown(KeyS); modifiers=[Alt], action_dispatch=DocumentMessage::ToggleSnapping), + entry!(KeyDown(KeyH); modifiers=[Accel], action_dispatch=DocumentMessage::ToggleSelectedVisibility), + entry!(KeyDown(KeyL); modifiers=[Accel], action_dispatch=DocumentMessage::ToggleSelectedLocked), entry!(KeyDown(KeyG); modifiers=[Alt], action_dispatch=DocumentMessage::ToggleGridVisibility), entry!(KeyDown(KeyZ); modifiers=[Accel, Shift], action_dispatch=DocumentMessage::Redo), entry!(KeyDown(KeyY); modifiers=[Accel], action_dispatch=DocumentMessage::Redo), diff --git a/editor/src/messages/portfolio/document/document_message.rs b/editor/src/messages/portfolio/document/document_message.rs index c23c2381..760bcc17 100644 --- a/editor/src/messages/portfolio/document/document_message.rs +++ b/editor/src/messages/portfolio/document/document_message.rs @@ -153,6 +153,8 @@ pub enum DocumentMessage { ToggleLayerExpansion { id: NodeId, }, + ToggleSelectedVisibility, + ToggleSelectedLocked, ToggleGridVisibility, ToggleOverlaysVisibility, ToggleSnapping, diff --git a/editor/src/messages/portfolio/document/document_message_handler.rs b/editor/src/messages/portfolio/document/document_message_handler.rs index b3451a75..ab68b45b 100644 --- a/editor/src/messages/portfolio/document/document_message_handler.rs +++ b/editor/src/messages/portfolio/document/document_message_handler.rs @@ -1081,6 +1081,10 @@ impl MessageHandler> for DocumentMessag } responses.add(NodeGraphMessage::SendGraph); } + DocumentMessage::ToggleSelectedLocked => responses.add(NodeGraphMessage::ToggleSelectedLocked), + DocumentMessage::ToggleSelectedVisibility => { + responses.add(NodeGraphMessage::ToggleSelectedVisibility); + } DocumentMessage::ToggleGridVisibility => { self.snapping_state.grid_snapping = !self.snapping_state.grid_snapping; responses.add(OverlaysMessage::Draw); @@ -1311,6 +1315,8 @@ impl MessageHandler> for DocumentMessag SelectedLayersRaise, SelectedLayersRaiseToFront, UngroupSelectedLayers, + ToggleSelectedVisibility, + ToggleSelectedLocked ); if !self.graph_view_overlay_open { select.extend(actions!(DocumentMessageDiscriminant; NudgeSelectedLayers));