godotengine
/
godot
mirror of https://github.com/godotengine/godot
1
0
Fork 0
Code

Merge a0f9e8f30c into 15ff450680

This commit is contained in:
Jayden Sipe 2025-02-28 01:36:31 +01:00 committed by GitHub
parent 15ff450680 a0f9e8f30c
commit c9e650bb7c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
editor/editor_node.cpp
View File

@ -4646,6 +4646,8 @@ void EditorNode::_project_run_started() {
bottom_panel->make_item_visible(log);
} else if (action_on_play == ACTION_ON_PLAY_OPEN_DEBUGGER) {
bottom_panel->make_item_visible(EditorDebuggerNode::get_singleton());
} else if (action_on_play == ACTION_ON_PLAY_CLOSE_BUTTOM_PANEL) {
bottom_panel->hide_bottom_panel();
}
}
@ -4653,6 +4655,8 @@ void EditorNode::_project_run_stopped() {
int action_on_stop = EDITOR_GET("run/bottom_panel/action_on_stop");
if (action_on_stop == ACTION_ON_STOP_CLOSE_BUTTOM_PANEL) {
bottom_panel->hide_bottom_panel();
} else if (action_on_stop == ACTION_ON_STOP_OPEN_OUTPUT) {
bottom_panel->make_item_visible(log);
}
}

2
editor/editor_node.h
View File

@ -127,10 +127,12 @@ public:
ACTION_ON_PLAY_DO_NOTHING,
ACTION_ON_PLAY_OPEN_OUTPUT,
ACTION_ON_PLAY_OPEN_DEBUGGER,
ACTION_ON_PLAY_CLOSE_BUTTOM_PANEL,
};
enum ActionOnStop {
ACTION_ON_STOP_DO_NOTHING,
ACTION_ON_STOP_OPEN_OUTPUT,
ACTION_ON_STOP_CLOSE_BUTTOM_PANEL,
};

4
editor/editor_settings.cpp
View File

@ -950,8 +950,8 @@ void EditorSettings::_load_defaults(Ref<ConfigFile> p_extra_config) {
_initial_set("run/auto_save/save_before_running", true, true);
// Bottom panel
EDITOR_SETTING_BASIC(Variant::INT, PROPERTY_HINT_ENUM, "run/bottom_panel/action_on_play", EditorNode::ACTION_ON_PLAY_OPEN_OUTPUT, "Do Nothing,Open Output,Open Debugger")
EDITOR_SETTING_BASIC(Variant::INT, PROPERTY_HINT_ENUM, "run/bottom_panel/action_on_stop", EditorNode::ACTION_ON_STOP_DO_NOTHING, "Do Nothing,Close Bottom Panel")
EDITOR_SETTING_BASIC(Variant::INT, PROPERTY_HINT_ENUM, "run/bottom_panel/action_on_play", EditorNode::ACTION_ON_PLAY_OPEN_OUTPUT, "Do Nothing,Open Output,Open Debugger,Close Bottom Panel")
EDITOR_SETTING_BASIC(Variant::INT, PROPERTY_HINT_ENUM, "run/bottom_panel/action_on_stop", EditorNode::ACTION_ON_STOP_DO_NOTHING, "Do Nothing,Open Output,Close Bottom Panel")
// Output
EDITOR_SETTING_BASIC(Variant::INT, PROPERTY_HINT_RANGE, "run/output/font_size", 13, "8,48,1")