Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-03 23:21:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

[Code Editor] Fix "Pick Color" menu option replacing multiple color items.

Browse source
This commit is contained in:
bruvzg 2025-07-09 14:49:52 +03:00 • committed by Pāvels Nadtočajevs
parent d7cc121e64
commit 7cee0327b2
No known key found for this signature in database
GPG key ID: 8413210218EF35D2
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
editor/script/script_text_editor.cpp
View file

@ -2460,7 +2460,6 @@ void ScriptTextEditor::_text_edit_gui_input(const Ref<InputEvent> &ev) {
if (has_color) { if (has_color) {
String line = tx->get_line(mouse_line); String line = tx->get_line(mouse_line);
color_position.x = mouse_line; color_position.x = mouse_line;
color_position.y = mouse_column;
int begin = -1; int begin = -1;
int end = -1; int end = -1;
@ -2528,6 +2527,8 @@ void ScriptTextEditor::_text_edit_gui_input(const Ref<InputEvent> &ev) {
} }
if (has_color) { if (has_color) {
color_panel->set_position(get_screen_position() + local_pos); color_panel->set_position(get_screen_position() + local_pos);
color_position.y = begin;
color_position.z = end;
} }
} }
_make_context_menu(tx->has_selection(), has_color, foldable, open_docs, goto_definition, local_pos); _make_context_menu(tx->has_selection(), has_color, foldable, open_docs, goto_definition, local_pos);
@ -2544,7 +2545,7 @@ void ScriptTextEditor::_color_changed(const Color &p_color) {
} }
String line = code_editor->get_text_editor()->get_line(color_position.x); String line = code_editor->get_text_editor()->get_line(color_position.x);
String line_with_replaced_args = line.replace(color_args, new_args); String line_with_replaced_args = line.substr(0, color_position.y) + line.substr(color_position.y, color_position.z - color_position.y).replace(color_args, new_args) + line.substr(color_position.z);
color_args = new_args; color_args = new_args;
code_editor->get_text_editor()->begin_complex_operation(); code_editor->get_text_editor()->begin_complex_operation();

2
editor/script/script_text_editor.h
View file

@ -112,7 +112,7 @@ class ScriptTextEditor : public ScriptEditorBase {
PopupPanel *color_panel = nullptr; PopupPanel *color_panel = nullptr;
ColorPicker *color_picker = nullptr; ColorPicker *color_picker = nullptr;
Vector2 color_position; Vector3i color_position;
String color_args; String color_args;
bool theme_loaded = false; bool theme_loaded = false;