Bläddra i källkod

Merge pull request #62567 from voylin/Print_Rich_fix_terminal_only

Fixing print_rich() which only displays correctly in terminal - Fixes #62560
Rémi Verschelde 3 år sedan
förälder
incheckning
0bc500eee9
2 ändrade filer med 11 tillägg och 0 borttagningar
  1. 8 0
      core/debugger/remote_debugger.cpp
  2. 3 0
      editor/debugger/script_editor_debugger.cpp

+ 8 - 0
core/debugger/remote_debugger.cpp

@@ -297,6 +297,14 @@ void RemoteDebugger::flush_output() {
 				}
 				strings.push_back(output_string.message);
 				types.push_back(MESSAGE_TYPE_ERROR);
+			} else if (output_string.type == MESSAGE_TYPE_LOG_RICH) {
+				if (!joined_log_strings.is_empty()) {
+					strings.push_back(String("\n").join(joined_log_strings));
+					types.push_back(MESSAGE_TYPE_LOG_RICH);
+					joined_log_strings.clear();
+				}
+				strings.push_back(output_string.message);
+				types.push_back(MESSAGE_TYPE_LOG_RICH);
 			} else {
 				joined_log_strings.push_back(output_string.message);
 			}

+ 3 - 0
editor/debugger/script_editor_debugger.cpp

@@ -428,6 +428,9 @@ void ScriptEditorDebugger::_parse_message(const String &p_msg, const Array &p_da
 				case RemoteDebugger::MESSAGE_TYPE_LOG: {
 					msg_type = EditorLog::MSG_TYPE_STD;
 				} break;
+				case RemoteDebugger::MESSAGE_TYPE_LOG_RICH: {
+					msg_type = EditorLog::MSG_TYPE_STD_RICH;
+				} break;
 				case RemoteDebugger::MESSAGE_TYPE_ERROR: {
 					msg_type = EditorLog::MSG_TYPE_ERROR;
 				} break;