Make bottom panel into available dock slot #108647

KoBeWi · 2025-07-15T21:01:03Z

Supersedes #106426

Adds a DOCK_SLOT_BOTTOM, which corresponds to bottom panel. All bottom panel controls are now docks. For compatibility, the old bottom editors are just wrapped in EditorDock.

This mostly brings changes to the dock popup, but also allows dragging docks between sides and bottom (currently only FileSystem):

godot.windows.editor.dev.x86_64_A0DP2XbvLh.mp4

Other than that, the current dock slot is now properly highlighted, slots unavailable for the current dock are darkened. The "Move to Bottom" button is replaced with a bottom dock slot.

I also added 3 new EditorDock properties: global (whether it appears in dock menu and can be closed), hidden (whether its tab is hidden) and title_color. All old bottom docks are non-global.

Dock's layout is now properly respected, i.e. you can make a dock that is horizontal only (in #106503 the LAYOUT_VERTICAL flag was effectively unused). I also added a LAYOUT_FLOATING flag, which determines whether the dock can float (all legacy bottom docks can't float).

In follow-ups I plan to update legacy docks to the new system, which would allow stuff like vertical ShaderEditor (it's already possible, but the editor is not adjusted for that, so the option is blocked). I will probably open a tracker for that.

A side-effect of these changes is that bottom docks can be rearranged, but I think it's not really a problem 🤔

Also for the future, I think EditorDockManager can be refactored, as it does too much. Some of its code can be moved to EditorDock and some of its code can be delegated to a new EditorDockContainer class extending TabContainer (the bottom panel would inherit it too). Also the main screen could potentially become a dock slot.

lodetrick

Initial thoughts. Regarding the popup interfering with the buttons I can fix that in the refactor.

editor/docks/editor_dock_manager.cpp

scene/gui/tab_bar.cpp

lodetrick · 2025-07-15T21:50:17Z

editor/docks/editor_dock_manager.cpp

 	p_tab_container->set_popup(dock_context_popup);
 	p_tab_container->connect("pre_popup_pressed", callable_mp(dock_context_popup, &DockContextPopup::select_current_dock_in_dock_slot).bind(p_dock_slot));


I personally chose not to have this popup appear for the bottom panel (because it is out of place with the other buttons), but it could also appear as one of the bottom panel's dedicated buttons

lodetrick · 2025-07-15T21:56:28Z

editor/docks/editor_dock_manager.cpp

-	p_tab_container->set_use_hidden_tabs_for_min_size(true);
 	p_tab_container->get_tab_bar()->connect(SceneStringName(gui_input), callable_mp(this, &EditorDockManager::_dock_container_gui_input).bind(p_tab_container));
 	p_tab_container->hide();
+	p_tab_container->set_meta("dock_layout", p_layout);


Is this necessary with the array of DockSlots? I see what you mean about the need for EditorDockContainer.

It was a quick hack, the problem is that _move_dock() takes the new parent directly instead of slot ID. It requires some changes.

editor/gui/editor_bottom_panel.cpp

doc/classes/EditorDock.xml

lodetrick · 2025-07-15T22:19:03Z

editor/docks/editor_dock_manager.h

+	DockConstants::DockSlot occupied_slot = DockConstants::DOCK_SLOT_MAX;
 	TabBar *drop_tabbar = nullptr;

 	Color valid_drop_color;


In my opinion, this PR should be the one to introduce the invalid_drop_color and relevant layout checks in EditorDockDragHint (to visually tell the user that they can/cannot drag onto the bottom dock.

For now I just removed highlight if the slot can't be dropped to.

arkology · 2025-07-16T07:23:46Z

Also, a side-effect of these changes is that bottom docks can be rearranged, but I think it's not really a problem

It will be set to default state (i.e. position) after selection "Reset layout" it top bar menu, right?

KoBeWi · 2025-07-16T13:55:41Z

Currently no. Bottom editors are not part of default layout, their order is semi-random.

editor/debugger/editor_debugger_node.cpp

editor/docks/editor_dock_manager.cpp

arkology · 2025-10-24T09:47:30Z

Not sure this is intended :)

godot.windows.editor.x86_64_slot_HfoZb7nt9F.mp4

arkology · 2025-10-24T16:58:19Z

Something bad is happening with the bottom panel size:

BTW does it happen in master?
I suppose size changes because of #109915
UPD: Yes, it does... Should we treat this as a bug?

KoBeWi · 2025-10-30T21:42:23Z

UPD: Yes, it does... Should we treat this as a bug?

Soo the problem is that previously when you selected Audio tab, the panel would expand height, but then shrink down once you select a smaller dock. Now the new height is permanent, and also bigger than before for some reason. So yeah, it is a bug.

KoBeWi · 2025-10-30T22:33:27Z

I think I resolved all problems.
#106164 still needs to be rebased and merged, so this is going to be a draft for a bit more.

Mickeon · 2025-11-09T16:37:34Z

doc/classes/EditorDock.xml

 		<member name="dock_shortcut" type="Shortcut" setter="set_dock_shortcut" getter="get_dock_shortcut">
 			The shortcut used to open the dock. This property can only be set before this dock is added via [method EditorPlugin.add_dock].
 		</member>
+		<member name="global" type="bool" setter="set_global" getter="is_global" default="true">


You may argue this needs to be named dock_global at this point, as you did prior, but I'm not sure either. So long as it's not is_global because we use verbs specifically for getter methods.

... Is calling this property global even appropriate?

What would be a better name?

doc/classes/EditorDock.xml

Mickeon · 2025-11-09T16:43:42Z

doc/classes/EditorDock.xml

 			The icon for the dock, as a texture. If specified, it will override [member icon_name].
 		</member>
+		<member name="dock_hidden" type="bool" setter="set_hidden" getter="is_hidden" default="false">
+			If [code]true[/code], the dock's tab will be hidden. If [member global] is [code]true[/code], the dock will not appear in the dock menu.


In another description you name this dock "Editor > Editor Docks", so this is a matter of consistency and clarity.

Suggested change

If [code]true[/code], the dock's tab will be hidden. If [member global] is [code]true[/code], the dock will not appear in the dock menu.

If [code]true[/code], the dock's tab will be hidden. If [member global] is [code]true[/code], the dock will not appear in the [b]Editor > Editor Docks[/b] menu.

Although one could argue that the latter sentence should actually belong in global's description. I can't think of a nice way to make it fit.

Also maybe this should be reversed to dock_shown, instead? Just spitballing. Something about this API doesn't convince me.

Maybe it could be renamed to active.

"Active" would imply it begins processing something if set to true, as I've skimmed through the class reference to verify the consistency of it. Depending on how you look at it, it may be loosely appropriate. There's also RichTextLabel.scroll_active...

Is enabled too generic?

enabled is already used internally for something different.

doc/classes/EditorDock.xml

editor/script/script_editor_plugin.cpp

arkology · 2025-11-10T12:34:45Z

UPD: Yes, it does... Should we treat this as a bug?

Soo the problem is that previously when you selected Audio tab, the panel would expand height, but then shrink down once you select a smaller dock. Now the new height is permanent, and also bigger than before for some reason. So yeah, it is a bug.

I've read the code (i.e. related changes after my PR) a bit. And looks like everything is completely broken after #106164.

Now the new height is permanent

Yes, this is my omission, I did not take into account all the cases. Will think how it can be fixed.

and also bigger than before for some reason

I suppose this is because of PR I've linked above. Also in current master restoring editor layout (split offset) at editor startup with active audio tab is also broken.

doc/classes/EditorDock.xml

KoBeWi · 2025-11-10T18:49:26Z

I've read the code (i.e. related changes after my PR) a bit. And looks like everything is completely broken after #106164.

The size bug is unrelated to #106164. I opened an issue: #112616

arkology · 2025-11-10T20:05:31Z

I mean, the part that worked before

KoBeWi · 2025-11-10T21:05:12Z

Before what? xd
The bigger size is part of the same issue.

KoBeWi added this to the 4.x milestone Jul 15, 2025

KoBeWi added enhancement topic:editor labels Jul 15, 2025

lodetrick reviewed Jul 15, 2025

View reviewed changes

KoBeWi force-pushed the docking_abyss branch from ffbaac4 to 1566154 Compare July 16, 2025 14:29

lodetrick reviewed Jul 16, 2025

View reviewed changes

editor/debugger/editor_debugger_node.cpp Show resolved Hide resolved

editor/docks/editor_dock_manager.cpp Show resolved Hide resolved

editor/docks/editor_dock_manager.cpp Outdated Show resolved Hide resolved

KoBeWi mentioned this pull request Oct 2, 2025

Add support for custom font colors in the TabBar #106263

Merged

KoBeWi mentioned this pull request Oct 23, 2025

Refactor editor EditorBottomPanel to be a TabContainer #106164

Merged

KoBeWi modified the milestones: 4.x, 4.6 Oct 24, 2025

KoBeWi force-pushed the docking_abyss branch from 1566154 to f45e708 Compare October 24, 2025 07:59

KoBeWi force-pushed the docking_abyss branch from f45e708 to 0fa6c9a Compare October 24, 2025 16:08

This comment was marked as resolved.

Sign in to view

KoBeWi force-pushed the docking_abyss branch from 0fa6c9a to 7941405 Compare October 30, 2025 22:31

KoBeWi force-pushed the docking_abyss branch from 7941405 to dd84a16 Compare November 7, 2025 22:44

KoBeWi marked this pull request as ready for review November 7, 2025 22:45

KoBeWi requested review from a team as code owners November 7, 2025 22:45

KoBeWi force-pushed the docking_abyss branch 2 times, most recently from 507418b to 2f66f2e Compare November 9, 2025 09:18

Mickeon reviewed Nov 9, 2025

View reviewed changes

AThousandShips reviewed Nov 10, 2025

View reviewed changes

doc/classes/EditorDock.xml Outdated Show resolved Hide resolved

Make bottom panel into available dock slot

bceaa89

KoBeWi force-pushed the docking_abyss branch from 2f66f2e to bceaa89 Compare November 10, 2025 18:33

KoBeWi mentioned this pull request Nov 10, 2025

TRACKER: Fully integrate the bottom panel with docks godotengine/godot-proposals#12430

Open

17 tasks

		p_tab_container->set_popup(dock_context_popup);
		p_tab_container->connect("pre_popup_pressed", callable_mp(dock_context_popup, &DockContextPopup::select_current_dock_in_dock_slot).bind(p_dock_slot));

	If [code]true[/code], the dock's tab will be hidden. If [member global] is [code]true[/code], the dock will not appear in the dock menu.
	If [code]true[/code], the dock's tab will be hidden. If [member global] is [code]true[/code], the dock will not appear in the [b]Editor > Editor Docks[/b] menu.

Uh oh!

Make bottom panel into available dock slot #108647

Are you sure you want to change the base?

Make bottom panel into available dock slot #108647

Conversation

KoBeWi commented Jul 15, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

lodetrick left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

arkology commented Jul 16, 2025

Uh oh!

KoBeWi commented Jul 16, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

arkology commented Oct 24, 2025

Uh oh!

This comment was marked as resolved.

arkology commented Oct 24, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

KoBeWi commented Oct 30, 2025

Uh oh!

KoBeWi commented Oct 30, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Mickeon Nov 9, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

arkology commented Nov 10, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

KoBeWi commented Nov 10, 2025

Uh oh!

arkology commented Nov 10, 2025

Uh oh!

KoBeWi commented Nov 10, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

KoBeWi commented Jul 15, 2025 •

edited

Loading

lodetrick left a comment •

edited

Loading

arkology commented Oct 24, 2025 •

edited

Loading

Mickeon Nov 9, 2025 •

edited

Loading

arkology commented Nov 10, 2025 •

edited

Loading