From 8cfbc6bda295379f7c28a41f52cf89cb0d999a56 Mon Sep 17 00:00:00 2001 From: Yuri Sizov Date: Fri, 23 Jun 2023 15:23:36 +0200 Subject: [PATCH] Revert "Remember only permanent bottom tabs" This reverts commit 5dde57e95827806101cede5d46391f2bd4b9150c. --- editor/editor_audio_buses.cpp | 2 +- editor/editor_node.cpp | 7 +++---- editor/editor_node.h | 3 +-- editor/plugins/animation_player_editor_plugin.cpp | 2 +- editor/plugins/debugger_editor_plugin.cpp | 2 +- editor/plugins/shader_editor_plugin.cpp | 2 +- 6 files changed, 8 insertions(+), 10 deletions(-) diff --git a/editor/editor_audio_buses.cpp b/editor/editor_audio_buses.cpp index 74fa4ba7839..93788dc8b13 100644 --- a/editor/editor_audio_buses.cpp +++ b/editor/editor_audio_buses.cpp @@ -1050,7 +1050,7 @@ void EditorAudioBuses::_update_buses() { EditorAudioBuses *EditorAudioBuses::register_editor() { EditorAudioBuses *audio_buses = memnew(EditorAudioBuses); - EditorNode::get_singleton()->add_bottom_panel_item(TTR("Audio"), audio_buses, true); + EditorNode::get_singleton()->add_bottom_panel_item(TTR("Audio"), audio_buses); return audio_buses; } diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp index 10676ce2719..da14f5374c7 100644 --- a/editor/editor_node.cpp +++ b/editor/editor_node.cpp @@ -5256,7 +5256,7 @@ void EditorNode::_save_central_editor_layout_to_config(Ref p_config_ int selected_bottom_panel_item_idx = -1; for (int i = 0; i < bottom_panel_items.size(); i++) { - if (bottom_panel_items[i].permanent && bottom_panel_items[i].button->is_pressed()) { + if (bottom_panel_items[i].button->is_pressed()) { selected_bottom_panel_item_idx = i; break; } @@ -5663,7 +5663,7 @@ void EditorNode::_scene_tab_changed(int p_tab) { set_current_scene(p_tab); } -Button *EditorNode::add_bottom_panel_item(String p_text, Control *p_item, bool p_permanent) { +Button *EditorNode::add_bottom_panel_item(String p_text, Control *p_item) { Button *tb = memnew(Button); tb->set_flat(true); tb->connect("toggled", callable_mp(this, &EditorNode::_bottom_panel_switch).bind(bottom_panel_items.size())); @@ -5679,7 +5679,6 @@ Button *EditorNode::add_bottom_panel_item(String p_text, Control *p_item, bool p bpi.button = tb; bpi.control = p_item; bpi.name = p_text; - bpi.permanent = p_permanent; // Serves as an information when saving editor layout. bottom_panel_items.push_back(bpi); return tb; @@ -7756,7 +7755,7 @@ EditorNode::EditorNode() { bottom_panel_raise->connect("toggled", callable_mp(this, &EditorNode::_bottom_panel_raise_toggled)); log = memnew(EditorLog); - Button *output_button = add_bottom_panel_item(TTR("Output"), log, true); + Button *output_button = add_bottom_panel_item(TTR("Output"), log); log->set_tool_button(output_button); center_split->connect("resized", callable_mp(this, &EditorNode::_vp_resized)); diff --git a/editor/editor_node.h b/editor/editor_node.h index 2f2794de427..65f85a76c98 100644 --- a/editor/editor_node.h +++ b/editor/editor_node.h @@ -252,7 +252,6 @@ private: String name; Control *control = nullptr; Button *button = nullptr; - bool permanent = false; }; struct ExportDefer { @@ -905,7 +904,7 @@ public: bool is_exiting() const { return exiting; } - Button *add_bottom_panel_item(String p_text, Control *p_item, bool p_permanent = false); + Button *add_bottom_panel_item(String p_text, Control *p_item); void make_bottom_panel_item_visible(Control *p_item); void raise_bottom_panel_item(Control *p_item); void hide_bottom_panel(); diff --git a/editor/plugins/animation_player_editor_plugin.cpp b/editor/plugins/animation_player_editor_plugin.cpp index 7f79b6a893f..1fdb1d4a6ec 100644 --- a/editor/plugins/animation_player_editor_plugin.cpp +++ b/editor/plugins/animation_player_editor_plugin.cpp @@ -1998,7 +1998,7 @@ void AnimationPlayerEditorPlugin::make_visible(bool p_visible) { AnimationPlayerEditorPlugin::AnimationPlayerEditorPlugin() { anim_editor = memnew(AnimationPlayerEditor(this)); - EditorNode::get_singleton()->add_bottom_panel_item(TTR("Animation"), anim_editor, true); + EditorNode::get_singleton()->add_bottom_panel_item(TTR("Animation"), anim_editor); } AnimationPlayerEditorPlugin::~AnimationPlayerEditorPlugin() { diff --git a/editor/plugins/debugger_editor_plugin.cpp b/editor/plugins/debugger_editor_plugin.cpp index eb1d71d224a..3068ad3f932 100644 --- a/editor/plugins/debugger_editor_plugin.cpp +++ b/editor/plugins/debugger_editor_plugin.cpp @@ -53,7 +53,7 @@ DebuggerEditorPlugin::DebuggerEditorPlugin(PopupMenu *p_debug_menu) { file_server = memnew(EditorFileServer); EditorDebuggerNode *debugger = memnew(EditorDebuggerNode); - Button *db = EditorNode::get_singleton()->add_bottom_panel_item(TTR("Debugger"), debugger, true); + Button *db = EditorNode::get_singleton()->add_bottom_panel_item(TTR("Debugger"), debugger); // Add separation for the warning/error icon that is displayed later. db->add_theme_constant_override("h_separation", 6 * EDSCALE); debugger->set_tool_button(db); diff --git a/editor/plugins/shader_editor_plugin.cpp b/editor/plugins/shader_editor_plugin.cpp index 3c576a5acb9..268828e8f53 100644 --- a/editor/plugins/shader_editor_plugin.cpp +++ b/editor/plugins/shader_editor_plugin.cpp @@ -622,7 +622,7 @@ ShaderEditorPlugin::ShaderEditorPlugin() { empty.instantiate(); shader_tabs->add_theme_style_override("panel", empty); - button = EditorNode::get_singleton()->add_bottom_panel_item(TTR("Shader Editor"), window_wrapper, true); + button = EditorNode::get_singleton()->add_bottom_panel_item(TTR("Shader Editor"), window_wrapper); // Defer connect because Editor class is not in the binding system yet. EditorNode::get_singleton()->call_deferred("connect", "resource_saved", callable_mp(this, &ShaderEditorPlugin::_resource_saved), CONNECT_DEFERRED);