godotengine
/
godot
mirror of https://github.com/godotengine/godot
1
0
Fork 0
Code

Merge pull request #113775 from KoBeWi/waiting_for_DockTabContainer 

Fix bottom panel pinning
This commit is contained in:
Rémi Verschelde 2025-12-09 17:17:48 +01:00
parent 64640a01c7 c15e04cc43
commit f8ea55122a
No known key found for this signature in database
GPG Key ID: C3336907360768E1
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
editor/docks/editor_dock_manager.cpp
View File

@ -866,7 +866,7 @@ void EditorDockManager::focus_dock(EditorDock *p_dock) {
}
if (!p_dock->is_open) {
open_dock(p_dock);
open_dock(p_dock, false);
}
if (p_dock->dock_window) {
@ -874,7 +874,11 @@ void EditorDockManager::focus_dock(EditorDock *p_dock) {
return;
}
if (!docks_visible && p_dock->get_parent() != EditorNode::get_bottom_panel()) {
if (p_dock->get_parent() == EditorNode::get_bottom_panel()) {
if (EditorNode::get_bottom_panel()->is_locked()) {
return;
}
} else if (!docks_visible) {
return;
}

1
editor/gui/editor_bottom_panel.h
View File

@ -77,6 +77,7 @@ public:
void toggle_last_opened_bottom_panel();
void set_expanded(bool p_expanded);
void _theme_changed();
bool is_locked() const { return lock_panel_switching; }
void set_bottom_panel_offset(int p_offset);
int get_bottom_panel_offset();