From fa6f86b886bf199ea0788743a49503e449afb5f7 Mon Sep 17 00:00:00 2001 From: azagaya Date: Sat, 26 Jan 2019 15:41:36 -0300 Subject: Make tab containers in editor, project settings, and export dialog, to use hidden tabs for min size computation. --- editor/editor_node.cpp | 4 +++- editor/project_export.cpp | 1 + editor/project_settings_editor.cpp | 7 +++++-- 3 files changed, 9 insertions(+), 3 deletions(-) (limited to 'editor') diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp index 0ff0bca7ee..677e3ad523 100644 --- a/editor/editor_node.cpp +++ b/editor/editor_node.cpp @@ -889,7 +889,8 @@ bool EditorNode::_find_and_save_edited_subresources(Object *obj, Map ret_changed = true; } } break; - default: {} + default: { + } } } @@ -5102,6 +5103,7 @@ EditorNode::EditorNode() { dock_slot[i]->set_drag_to_rearrange_enabled(true); dock_slot[i]->set_tabs_rearrange_group(1); dock_slot[i]->connect("tab_changed", this, "_dock_tab_changed"); + dock_slot[i]->set_use_hidden_tabs_for_min_size(true); } dock_drag_timer = memnew(Timer); diff --git a/editor/project_export.cpp b/editor/project_export.cpp index ec64d76b18..54b7270f19 100644 --- a/editor/project_export.cpp +++ b/editor/project_export.cpp @@ -1115,6 +1115,7 @@ ProjectExportDialog::ProjectExportDialog() { sections = memnew(TabContainer); sections->set_tab_align(TabContainer::ALIGN_LEFT); + sections->set_use_hidden_tabs_for_min_size(true); settings_vb->add_child(sections); sections->set_v_size_flags(SIZE_EXPAND_FILL); diff --git a/editor/project_settings_editor.cpp b/editor/project_settings_editor.cpp index cc33550ac9..24e2a08657 100644 --- a/editor/project_settings_editor.cpp +++ b/editor/project_settings_editor.cpp @@ -294,7 +294,8 @@ void ProjectSettingsEditor::_device_input_add() { ie = jb; } break; - default: {} + default: { + } } if (idx < 0 || idx >= events.size()) { @@ -519,7 +520,8 @@ void ProjectSettingsEditor::_add_item(int p_item, Ref p_exiting_even } } break; - default: {} + default: { + } } } @@ -1679,6 +1681,7 @@ ProjectSettingsEditor::ProjectSettingsEditor(EditorData *p_data) { tab_container = memnew(TabContainer); tab_container->set_tab_align(TabContainer::ALIGN_LEFT); + tab_container->set_use_hidden_tabs_for_min_size(true); add_child(tab_container); VBoxContainer *props_base = memnew(VBoxContainer); -- cgit v1.2.3