godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #58770 from YeldhamDev/some_crumbles_left 

Replace some bits of code left to work with the new `TabContainer`
This commit is contained in:
Rémi Verschelde 2022-03-04 23:39:25 +01:00 committed by GitHub
parent 27377170d2 917dac78e7
commit c9d0523302
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
editor/editor_resource_picker.cpp
View File

@ -337,7 +337,7 @@ void EditorResourcePicker::_edit_menu_cbk(int p_which) {
// Ensure that the FileSystem dock is visible. // Ensure that the FileSystem dock is visible.
TabContainer *tab_container = (TabContainer *)file_system_dock->get_parent_control(); TabContainer *tab_container = (TabContainer *)file_system_dock->get_parent_control();
tab_container->set_current_tab(file_system_dock->get_index()); tab_container->set_current_tab(tab_container->get_tab_idx_from_control(file_system_dock));
} break; } break;
default: { default: {

6
editor/plugins/script_editor_plugin.cpp
View File

@ -810,7 +810,7 @@ void ScriptEditor::_close_tab(int p_idx, bool p_save, bool p_history_back) {
} }
if (idx >= 0) { if (idx >= 0) {
if (history_pos >= 0) { if (history_pos >= 0) {
idx = history[history_pos].control->get_index(); idx = tab_container->get_tab_idx_from_control(history[history_pos].control);
} }
tab_container->set_current_tab(idx); tab_container->set_current_tab(idx);
} else { } else {
@ -1429,7 +1429,7 @@ void ScriptEditor::_menu_option(int p_option) {
file_system_dock->navigate_to_path(path); file_system_dock->navigate_to_path(path);
// Ensure that the FileSystem dock is visible. // Ensure that the FileSystem dock is visible.
TabContainer *tab_container = (TabContainer *)file_system_dock->get_parent_control(); TabContainer *tab_container = (TabContainer *)file_system_dock->get_parent_control();
tab_container->set_current_tab(file_system_dock->get_index()); tab_container->set_current_tab(tab_container->get_tab_idx_from_control(file_system_dock));
} }
} break; } break;
case CLOSE_DOCS: { case CLOSE_DOCS: {
@ -3376,7 +3376,7 @@ void ScriptEditor::_update_history_pos(int p_new_pos) {
} }
history_pos = p_new_pos; history_pos = p_new_pos;
tab_container->set_current_tab(history[history_pos].control->get_index()); tab_container->set_current_tab(tab_container->get_tab_idx_from_control(history[history_pos].control));
n = history[history_pos].control; n = history[history_pos].control;

2
editor/project_settings_editor.cpp
View File

@ -63,7 +63,7 @@ void ProjectSettingsEditor::queue_save() {
} }
void ProjectSettingsEditor::set_plugins_page() { void ProjectSettingsEditor::set_plugins_page() {
tab_container->set_current_tab(plugin_settings->get_index()); tab_container->set_current_tab(tab_container->get_tab_idx_from_control(plugin_settings));
} }
void ProjectSettingsEditor::update_plugins() { void ProjectSettingsEditor::update_plugins() {

2
editor/property_editor.cpp
View File

@ -228,7 +228,7 @@ void CustomPropertyEditor::_menu_option(int p_which) {
file_system_dock->navigate_to_path(r->get_path()); file_system_dock->navigate_to_path(r->get_path());
// Ensure that the FileSystem dock is visible. // Ensure that the FileSystem dock is visible.
TabContainer *tab_container = (TabContainer *)file_system_dock->get_parent_control(); TabContainer *tab_container = (TabContainer *)file_system_dock->get_parent_control();
tab_container->set_current_tab(file_system_dock->get_index()); tab_container->set_current_tab(tab_container->get_tab_idx_from_control(file_system_dock));
} break; } break;
default: { default: {
if (p_which >= CONVERT_BASE_ID) { if (p_which >= CONVERT_BASE_ID) {

6
editor/scene_tree_editor.cpp
View File

@ -135,7 +135,8 @@ void SceneTreeEditor::_cell_button_pressed(Object *p_item, int p_column, int p_i
set_selected(n); set_selected(n);
NodeDock::get_singleton()->get_parent()->call("set_current_tab", NodeDock::get_singleton()->get_index()); TabContainer *tab_container = Object::cast_to<TabContainer>(NodeDock::get_singleton()->get_parent());
NodeDock::get_singleton()->get_parent()->call("set_current_tab", tab_container->get_tab_idx_from_control(NodeDock::get_singleton()));
NodeDock::get_singleton()->show_connections(); NodeDock::get_singleton()->show_connections();
} else if (p_id == BUTTON_GROUPS) { } else if (p_id == BUTTON_GROUPS) {
@ -144,7 +145,8 @@ void SceneTreeEditor::_cell_button_pressed(Object *p_item, int p_column, int p_i
set_selected(n); set_selected(n);
NodeDock::get_singleton()->get_parent()->call("set_current_tab", NodeDock::get_singleton()->get_index()); TabContainer *tab_container = Object::cast_to<TabContainer>(NodeDock::get_singleton()->get_parent());
NodeDock::get_singleton()->get_parent()->call("set_current_tab", tab_container->get_tab_idx_from_control(NodeDock::get_singleton()));
NodeDock::get_singleton()->show_groups(); NodeDock::get_singleton()->show_groups();
} }
} }