godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-23 15:16:17 +00:00
Code Releases Wiki Activity

Merge pull request #108440 from kitbdev/fix-colorpicker-wrong-line

Browse Source 
Fix ScriptEditor inline color wrong line number
This commit is contained in:
Thaddeus Crews
2025-07-10 11:39:20 -05:00
parent cbc6d78aed 927208a92e
commit ed02254b2c
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
editor/script/script_text_editor.cpp
View File

@@ -404,7 +404,7 @@ bool ScriptTextEditor::_is_valid_color_info(const Dictionary &p_info) {
return true; return true;
} }
Array ScriptTextEditor::_inline_object_parse(const String &p_text, int p_line) { Array ScriptTextEditor::_inline_object_parse(const String &p_text) {
Array result; Array result;
int i_end_previous = 0; int i_end_previous = 0;
int i_start = p_text.find("Color"); int i_start = p_text.find("Color");
@@ -426,7 +426,6 @@ Array ScriptTextEditor::_inline_object_parse(const String &p_text, int p_line) {
} }
Dictionary color_info; Dictionary color_info;
color_info["line"] = p_line;
color_info["column"] = i_start; color_info["column"] = i_start;
color_info["width_ratio"] = 1.0; color_info["width_ratio"] = 1.0;
color_info["color_end"] = i_par_end; color_info["color_end"] = i_par_end;

2
editor/script/script_text_editor.h
View File

@@ -205,7 +205,7 @@ protected:
void _warning_clicked(const Variant &p_line); void _warning_clicked(const Variant &p_line);
bool _is_valid_color_info(const Dictionary &p_info); bool _is_valid_color_info(const Dictionary &p_info);
Array _inline_object_parse(const String &p_text, int p_line); Array _inline_object_parse(const String &p_text);
void _inline_object_draw(const Dictionary &p_info, const Rect2 &p_rect); void _inline_object_draw(const Dictionary &p_info, const Rect2 &p_rect);
void _inline_object_handle_click(const Dictionary &p_info, const Rect2 &p_rect); void _inline_object_handle_click(const Dictionary &p_info, const Rect2 &p_rect);
String _picker_color_stringify(const Color &p_color, COLOR_MODE p_mode); String _picker_color_stringify(const Color &p_color, COLOR_MODE p_mode);

13
scene/gui/text_edit.cpp
View File

@@ -255,7 +255,7 @@ inline bool is_inline_info_valid(const Variant &p_info) {
return false; return false;
} }
Dictionary info = p_info; Dictionary info = p_info;
if (!info.get_valid("column").is_num() || !info.get_valid("line").is_num() || !info.get_valid("width_ratio").is_num()) { if (!info.get_valid("column").is_num() || !info.get_valid("width_ratio").is_num()) {
return false; return false;
} }
return true; return true;
@@ -300,7 +300,7 @@ void TextEdit::Text::invalidate_cache(int p_line, bool p_text_changed) {
int from = 0; int from = 0;
if (inline_object_parser.is_valid()) { if (inline_object_parser.is_valid()) {
// Insert inline object. // Insert inline object.
Variant parsed_result = inline_object_parser.call(text_with_ime, p_line); Variant parsed_result = inline_object_parser.call(text_with_ime);
if (parsed_result.is_array()) { if (parsed_result.is_array()) {
Array object_infos = parsed_result; Array object_infos = parsed_result;
for (Variant val : object_infos) { for (Variant val : object_infos) {
@@ -2386,12 +2386,13 @@ void TextEdit::gui_input(const Ref<InputEvent> &p_gui_input) {
float wrap_indent = wrap_i > first_indent_line ? MIN(text.get_indent_offset(pos.y, is_layout_rtl()), wrap_at_column * 0.6) : 0.0; float wrap_indent = wrap_i > first_indent_line ? MIN(text.get_indent_offset(pos.y, is_layout_rtl()), wrap_at_column * 0.6) : 0.0;
Ref<TextParagraph> ldata = text.get_line_data(line); Ref<TextParagraph> ldata = text.get_line_data(line);
for (Variant k : ldata->get_line_objects(wrap_i)) { for (const Variant &inline_key : ldata->get_line_objects(wrap_i)) {
if (!is_inline_info_valid(k)) { if (!is_inline_info_valid(inline_key)) {
continue; continue;
} }
Dictionary info = k; Dictionary info = inline_key.duplicate();
Rect2 obj_rect = ldata->get_line_object_rect(wrap_i, k); info["line"] = line;
Rect2 obj_rect = ldata->get_line_object_rect(wrap_i, inline_key);
obj_rect.position.x += xmargin_beg + wrap_indent - first_visible_col; obj_rect.position.x += xmargin_beg + wrap_indent - first_visible_col;
if (mpos.x > obj_rect.position.x && mpos.x < obj_rect.get_end().x) { if (mpos.x > obj_rect.position.x && mpos.x < obj_rect.get_end().x) {