From 04b63f1007e8080d5c626f8e61878f71c6144bd0 Mon Sep 17 00:00:00 2001 From: RyanRothweiler Date: Thu, 17 Oct 2024 16:31:47 -0700 Subject: [PATCH 1/2] Text tool escape sends commit message --- editor/src/messages/input_mapper/input_mappings.rs | 2 +- editor/src/messages/tool/tool_messages/text_tool.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/editor/src/messages/input_mapper/input_mappings.rs b/editor/src/messages/input_mapper/input_mappings.rs index bccaadef53..5b2c759aeb 100644 --- a/editor/src/messages/input_mapper/input_mappings.rs +++ b/editor/src/messages/input_mapper/input_mappings.rs @@ -151,7 +151,7 @@ pub fn input_mappings() -> Mapping { // // TextToolMessage entry!(KeyUp(MouseLeft); action_dispatch=TextToolMessage::Interact), - entry!(KeyDown(Escape); action_dispatch=TextToolMessage::Abort), + entry!(KeyDown(Escape); action_dispatch=TextToolMessage::CommitText), entry!(KeyDown(Enter); modifiers=[Accel], action_dispatch=TextToolMessage::CommitText), // // GradientToolMessage diff --git a/editor/src/messages/tool/tool_messages/text_tool.rs b/editor/src/messages/tool/tool_messages/text_tool.rs index 207b74d829..78926a3af0 100644 --- a/editor/src/messages/tool/tool_messages/text_tool.rs +++ b/editor/src/messages/tool/tool_messages/text_tool.rs @@ -497,7 +497,7 @@ impl Fsm for TextToolFsmState { HintGroup(vec![HintInfo::mouse(MouseMotion::Lmb, "Edit Text")]), ]), TextToolFsmState::Editing => HintData(vec![ - HintGroup(vec![HintInfo::keys([Key::Escape], "Discard Changes")]), + HintGroup(vec![HintInfo::keys([Key::Escape], "Commit Changes")]), HintGroup(vec![HintInfo::keys([Key::Control, Key::Enter], "Commit Changes").add_mac_keys([Key::Command, Key::Enter])]), ]), }; From ba654838d1ded026ef51053f0dd151333c26f2c6 Mon Sep 17 00:00:00 2001 From: Keavon Chambers Date: Fri, 25 Oct 2024 17:44:39 -0700 Subject: [PATCH 2/2] Improve hint text --- editor/src/messages/tool/tool_messages/text_tool.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/editor/src/messages/tool/tool_messages/text_tool.rs b/editor/src/messages/tool/tool_messages/text_tool.rs index 78926a3af0..748b428ca7 100644 --- a/editor/src/messages/tool/tool_messages/text_tool.rs +++ b/editor/src/messages/tool/tool_messages/text_tool.rs @@ -496,10 +496,10 @@ impl Fsm for TextToolFsmState { HintGroup(vec![HintInfo::mouse(MouseMotion::Lmb, "Place Text")]), HintGroup(vec![HintInfo::mouse(MouseMotion::Lmb, "Edit Text")]), ]), - TextToolFsmState::Editing => HintData(vec![ - HintGroup(vec![HintInfo::keys([Key::Escape], "Commit Changes")]), - HintGroup(vec![HintInfo::keys([Key::Control, Key::Enter], "Commit Changes").add_mac_keys([Key::Command, Key::Enter])]), - ]), + TextToolFsmState::Editing => HintData(vec![HintGroup(vec![ + HintInfo::keys([Key::Control, Key::Enter], "").add_mac_keys([Key::Command, Key::Enter]), + HintInfo::keys([Key::Escape], "Commit Changes").prepend_slash(), + ])]), }; responses.add(FrontendMessage::UpdateInputHints { hint_data });