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

Fix text layer getting deselected after clicking out of Text tool interactive editing (#2144)

Browse Source 
* properties panel remains active when user edits text layer

* Keep text layers selected after editing

* Update editor/src/messages/portfolio/document/document_message_handler.rs

* Delete Empty Text Layer on Escape or Right Click

* Fix: delete empty text layer on right click

---------

Co-authored-by: Keavon Chambers <keavon@keavon.com>
This commit is contained in:
Sidharth-Singh10
2024-12-31 14:28:56 -08:00
committed by GitHub
co-authored by Keavon Chambers
parent 39a7b76ade
commit f225756655
4 changed files with 48 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
editor/src/messages/tool/tool_messages/text_tool.rs
+43 -12
View File
@@ -56,7 +56,7 @@ pub enum TextToolMessage {
CommitText,
EditSelected,
Interact,
TextChange { new_text: String },
TextChange { new_text: String, is_right_click: bool },
UpdateBounds { new_text: String },
UpdateOptions(TextOptionsUpdate),
}
@@ -241,6 +241,19 @@ struct TextToolData {
}
impl TextToolData {
fn delete_empty_layer(&mut self, font_cache: &FontCache, responses: &mut VecDeque<Message>) -> TextToolFsmState {
// Remove the editable textbox UI first
self.set_editing(false, font_cache, responses);
// Delete the empty text layer and update the graph
responses.add(NodeGraphMessage::DeleteNodes {
node_ids: vec![self.layer.to_node()],
delete_children: true,
});
responses.add(NodeGraphMessage::RunDocumentGraph);
TextToolFsmState::Ready
}
/// Set the editing state of the currently modifying layer
fn set_editing(&self, editable: bool, font_cache: &FontCache, responses: &mut VecDeque<Message>) {
if let Some(editing_text) = self.editing_text.as_ref().filter(|_| editable) {
@@ -253,9 +266,13 @@ impl TextToolData {
transform: editing_text.transform.to_cols_array(),
});
} else {
// Check if DisplayRemoveEditableTextbox is already in the responses queue
let has_remove_textbox = responses.iter().any(|msg| matches!(msg, Message::Frontend(FrontendMessage::DisplayRemoveEditableTextbox)));
responses.add(FrontendMessage::DisplayRemoveEditableTextbox);
// Clear all selected nodes when no longer editing
responses.add(NodeGraphMessage::SelectedNodesSet { nodes: Vec::new() });
if has_remove_textbox {
responses.add(NodeGraphMessage::SelectedNodesSet { nodes: Vec::new() });
}
}
}
@@ -474,20 +491,34 @@ impl Fsm for TextToolFsmState {
TextToolFsmState::Ready
}
(TextToolFsmState::Editing, TextToolMessage::CommitText) => {
responses.add(FrontendMessage::TriggerTextCommit);
if tool_data.new_text.is_empty() {
return tool_data.delete_empty_layer(font_cache, responses);
}
responses.add(FrontendMessage::TriggerTextCommit);
TextToolFsmState::Editing
}
(TextToolFsmState::Editing, TextToolMessage::TextChange { new_text }) => {
tool_data.set_editing(false, font_cache, responses);
(TextToolFsmState::Editing, TextToolMessage::TextChange { new_text, is_right_click }) => {
tool_data.new_text = new_text;
responses.add(NodeGraphMessage::SetInput {
input_connector: InputConnector::node(graph_modification_utils::get_text_id(tool_data.layer, &document.network_interface).unwrap(), 1),
input: NodeInput::value(TaggedValue::String(new_text), false),
});
responses.add(NodeGraphMessage::RunDocumentGraph);
if !is_right_click {
tool_data.set_editing(false, font_cache, responses);
TextToolFsmState::Ready
responses.add(NodeGraphMessage::SetInput {
input_connector: InputConnector::node(graph_modification_utils::get_text_id(tool_data.layer, &document.network_interface).unwrap(), 1),
input: NodeInput::value(TaggedValue::String(tool_data.new_text.clone()), false),
});
responses.add(NodeGraphMessage::RunDocumentGraph);
TextToolFsmState::Ready
} else {
if tool_data.new_text.is_empty() {
return tool_data.delete_empty_layer(font_cache, responses);
}
responses.add(FrontendMessage::TriggerTextCommit);
TextToolFsmState::Editing
}
}
(TextToolFsmState::Editing, TextToolMessage::UpdateBounds { new_text }) => {
tool_data.new_text = new_text;