From ddb925967f0e9e6faa35acfdada01ac5c0508739 Mon Sep 17 00:00:00 2001 From: Haoyu Qiu Date: Fri, 18 Oct 2024 23:49:20 +0800 Subject: [PATCH] Translate main thread name in the editor instead of running project --- core/debugger/remote_debugger.cpp | 2 +- editor/debugger/script_editor_debugger.cpp | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/core/debugger/remote_debugger.cpp b/core/debugger/remote_debugger.cpp index fc1b7b74f99..0ee63e5b93f 100644 --- a/core/debugger/remote_debugger.cpp +++ b/core/debugger/remote_debugger.cpp @@ -419,7 +419,7 @@ void RemoteDebugger::debug(bool p_can_continue, bool p_is_error_breakpoint) { msg.push_back(error_str); ERR_FAIL_NULL(script_lang); msg.push_back(script_lang->debug_get_stack_level_count() > 0); - msg.push_back(Thread::get_caller_id() == Thread::get_main_id() ? String(RTR("Main Thread")) : itos(Thread::get_caller_id())); + msg.push_back(Thread::get_caller_id()); if (allow_focus_steal_fn) { allow_focus_steal_fn(); } diff --git a/editor/debugger/script_editor_debugger.cpp b/editor/debugger/script_editor_debugger.cpp index cbe7910518c..cc3e869c8da 100644 --- a/editor/debugger/script_editor_debugger.cpp +++ b/editor/debugger/script_editor_debugger.cpp @@ -332,8 +332,10 @@ void ScriptEditorDebugger::_parse_message(const String &p_msg, uint64_t p_thread if (p_msg == "debug_enter") { ERR_FAIL_COND(p_data.size() != 4); + const Thread::ID caller_id = p_data[3]; + ThreadDebugged td; - td.name = p_data[3]; + td.name = (caller_id == Thread::get_main_id()) ? TTR("Main Thread") : itos(caller_id); td.error = p_data[1]; td.can_debug = p_data[0]; td.has_stackdump = p_data[2]; @@ -1904,6 +1906,7 @@ ScriptEditorDebugger::ScriptEditorDebugger() { thread_hb->add_child(memnew(Label(TTR("Thread:")))); threads = memnew(OptionButton); thread_hb->add_child(threads); + threads->set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED); threads->set_h_size_flags(SIZE_EXPAND_FILL); threads->connect(SceneStringName(item_selected), callable_mp(this, &ScriptEditorDebugger::_select_thread));