godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2026-01-03 18:11:19 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #109987 from van800/shakhov/dap-devices

Browse Source 
Refactor debugging on a device with DAP - now possible with all device types
This commit is contained in:
Thaddeus Crews
2025-11-12 11:24:10 -06:00
parent e47fb8b898 49ac9f63fd
commit afa07c1a76
6 changed files with 39 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
editor/run/editor_run_bar.cpp
View File

@@ -456,7 +456,7 @@ String EditorRunBar::get_playing_scene() const {
return run_filename;
}
Error EditorRunBar::start_native_device(int p_device_id) {
Error EditorRunBar::start_native_device(int p_device_id) const {
return run_native->start_run_native(p_device_id);
}

2
editor/run/editor_run_bar.h
View File

@@ -121,7 +121,7 @@ public:
bool is_playing() const;
String get_playing_scene() const;
Error start_native_device(int p_device_id);
Error start_native_device(int p_device_id) const;
OS::ProcessID has_child_process(OS::ProcessID p_pid) const;
void stop_child_process(OS::ProcessID p_pid);

24
editor/run/editor_run_native.cpp
View File

@@ -55,20 +55,14 @@ void EditorRunNative::_notification(int p_what) {
if (eep.is_null()) {
continue;
}
int platform_idx = -1;
for (int j = 0; j < EditorExport::get_singleton()->get_export_platform_count(); j++) {
if (eep->get_name() == EditorExport::get_singleton()->get_export_platform(j)->get_name()) {
platform_idx = j;
break;
}
}
int dc = MIN(eep->get_options_count(), 9000);
const int platform_idx = EditorExport::get_singleton()->get_export_platform_index_by_name(eep->get_name());
const int device_count = MIN(eep->get_options_count(), 9000);
String error;
if (dc > 0 && preset->is_runnable()) {
if (device_count > 0 && preset->is_runnable()) {
popup->add_icon_item(eep->get_run_icon(), eep->get_name(), -1);
popup->set_item_disabled(-1, true);
for (int j = 0; j < dc; j++) {
popup->add_icon_item(eep->get_option_icon(j), eep->get_option_label(j), 10000 * platform_idx + j);
for (int j = 0; j < device_count; j++) {
popup->add_icon_item(eep->get_option_icon(j), eep->get_option_label(j), EditorExport::encode_platform_device_id(platform_idx, j));
popup->set_item_tooltip(-1, eep->get_option_tooltip(j));
popup->set_item_indent(-1, 2);
if (device_shortcut_id <= 4 && eep->is_option_runnable(j)) {
@@ -99,12 +93,10 @@ void EditorRunNative::_confirm_run_native() {
}
Error EditorRunNative::start_run_native(int p_id) {
if (p_id < 0) {
return OK;
}
ERR_FAIL_COND_V(p_id < 0, FAILED);
int platform = p_id / 10000;
int idx = p_id % 10000;
const int platform = EditorExport::decode_platform_from_id(p_id);
const int idx = EditorExport::decode_device_from_id(p_id);
resume_id = p_id;
if (!EditorNode::get_singleton()->ensure_main_scene(true)) {