Skip to content

Fix BottomPanel tab dropping #116380

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Repiteo merged 1 commit into from
Feb 18, 2026
Merged

Fix BottomPanel tab dropping #116380

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions editor/docks/dock_tab_container.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ bool EditorDockDragHint::can_drop_data(const Point2 &p_point, const Variant &p_d

void EditorDockDragHint::drop_data(const Point2 &p_point, const Variant &p_data) {
// Drop dock into last spot if not over tabbar.
if (drop_tabbar->get_rect().has_point(p_point)) {
if (drop_tabbar_parent->get_rect().has_point(p_point)) {
drop_tabbar->_handle_drop_data("tab_container_tab", p_point, p_data, callable_mp(this, &EditorDockDragHint::_drag_move_tab), callable_mp(this, &EditorDockDragHint::_drag_move_tab_from));
} else {
EditorDockManager *dock_manager = EditorDockManager::get_singleton();
Expand Down Expand Up @@ -72,13 +72,14 @@ void EditorDockDragHint::gui_input(const Ref<InputEvent> &p_event) {
if (mouse_inside_tabbar) {
queue_redraw();
}
mouse_inside_tabbar = drop_tabbar->get_rect().has_point(pos);
mouse_inside_tabbar = drop_tabbar_parent->get_rect().has_point(pos);
}
}

void EditorDockDragHint::set_slot(DockTabContainer *p_slot) {
dock_container = p_slot;
drop_tabbar = p_slot->get_tab_bar();
drop_tabbar_parent = (Control *)p_slot->get_internal_container();
}

void EditorDockDragHint::_notification(int p_what) {
Expand Down Expand Up @@ -130,8 +131,8 @@ void EditorDockDragHint::_notification(int p_what) {
draw_style_box(dock_drop_highlight, dock_rect);

// Only display tabbar hint if the mouse is over the tabbar.
if (drop_tabbar->get_global_rect().has_point(get_global_mouse_position())) {
draw_set_transform(drop_tabbar->get_position()); // The TabBar isn't always on top.
if (drop_tabbar_parent->get_global_rect().has_point(get_global_mouse_position())) {
draw_set_transform(drop_tabbar_parent->get_position()); // The TabBar isn't always on top.
drop_tabbar->_draw_tab_drop(get_canvas_item());
}
} break;
Expand Down
1 change: 1 addition & 0 deletions editor/docks/dock_tab_container.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ class EditorDockDragHint : public Control {
GDCLASS(EditorDockDragHint, Control);

DockTabContainer *dock_container = nullptr;
Control *drop_tabbar_parent = nullptr;
TabBar *drop_tabbar = nullptr;

Color valid_drop_color;
Expand Down