godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-04 12:00:25 +00:00
Code Releases Wiki Activity

Merge pull request #106503 from KoBeWi/docker_exe

Browse Source 
Rework editor docks
This commit is contained in:
Thaddeus Crews
2025-10-01 17:54:10 -05:00
parent 4594de69fd 97b398cba1
commit bf926c2000
26 changed files with 806 additions and 387 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
editor/editor_node.cpp
View File

@@ -6098,9 +6098,14 @@ void EditorNode::_update_layouts_menu() {
}
Vector<String> layouts = config->get_sections();
const String default_layout_name = TTR("Default");
for (const String &layout : layouts) {
if (layout == TTR("Default")) {
if (layout.contains_char('/')) {
continue;
}
if (layout == default_layout_name) {
editor_layouts->remove_item(editor_layouts->get_item_index(LAYOUT_DEFAULT));
overridden_default_layout = editor_layouts->get_item_count();
}
@@ -8423,36 +8428,26 @@ EditorNode::EditorNode() {
// Instantiate and place editor docks.
memnew(SceneTreeDock(scene_root, editor_selection, editor_data));
memnew(FileSystemDock);
memnew(InspectorDock(editor_data));
memnew(ImportDock);
memnew(NodeDock);
editor_dock_manager->add_dock(SceneTreeDock::get_singleton());
FileSystemDock *filesystem_dock = FileSystemDock::get_singleton();
memnew(ImportDock);
editor_dock_manager->add_dock(ImportDock::get_singleton());
FileSystemDock *filesystem_dock = memnew(FileSystemDock);
filesystem_dock->connect("inherit", callable_mp(this, &EditorNode::_inherit_request));
filesystem_dock->connect("instantiate", callable_mp(this, &EditorNode::_instantiate_request));
filesystem_dock->connect("display_mode_changed", callable_mp(this, &EditorNode::_save_editor_layout));
get_project_settings()->connect_filesystem_dock_signals(filesystem_dock);
editor_dock_manager->add_dock(filesystem_dock);
memnew(InspectorDock(editor_data));
editor_dock_manager->add_dock(InspectorDock::get_singleton());
memnew(NodeDock);
editor_dock_manager->add_dock(NodeDock::get_singleton());
history_dock = memnew(HistoryDock);
// Scene: Top left.
editor_dock_manager->add_dock(SceneTreeDock::get_singleton(), TTRC("Scene"), EditorDockManager::DOCK_SLOT_LEFT_UR, ED_SHORTCUT_AND_COMMAND("docks/open_scene", TTRC("Open Scene Dock")), "PackedScene");
// Import: Top left, behind Scene.
editor_dock_manager->add_dock(ImportDock::get_singleton(), TTRC("Import"), EditorDockManager::DOCK_SLOT_LEFT_UR, ED_SHORTCUT_AND_COMMAND("docks/open_import", TTRC("Open Import Dock")), "FileAccess");
// FileSystem: Bottom left.
editor_dock_manager->add_dock(FileSystemDock::get_singleton(), TTRC("FileSystem"), EditorDockManager::DOCK_SLOT_LEFT_BR, ED_SHORTCUT_AND_COMMAND("docks/open_filesystem", TTRC("Open FileSystem Dock"), KeyModifierMask::ALT | Key::F), "Folder");
// Inspector: Full height right.
editor_dock_manager->add_dock(InspectorDock::get_singleton(), TTRC("Inspector"), EditorDockManager::DOCK_SLOT_RIGHT_UL, ED_SHORTCUT_AND_COMMAND("docks/open_inspector", TTRC("Open Inspector Dock")), "AnimationTrackList");
// Node: Full height right, behind Inspector.
editor_dock_manager->add_dock(NodeDock::get_singleton(), TTRC("Node"), EditorDockManager::DOCK_SLOT_RIGHT_UL, ED_SHORTCUT_AND_COMMAND("docks/open_node", TTRC("Open Node Dock")), "Object");
// History: Full height right, behind Node.
editor_dock_manager->add_dock(history_dock, TTRC("History"), EditorDockManager::DOCK_SLOT_RIGHT_UL, ED_SHORTCUT_AND_COMMAND("docks/open_history", TTRC("Open History Dock")), "History");
editor_dock_manager->add_dock(history_dock);
// Add some offsets to left_r and main hsplits to make LEFT_R and RIGHT_L docks wider than minsize.
left_r_hsplit->set_split_offset(270 * EDSCALE);