Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-12-07 22:00:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #113521 from KoBeWi/switch_on_release_not_debug

Browse source 
Make dock tabs switch on button release
This commit is contained in:
Thaddeus Crews 2025-12-03 16:50:38 -06:00
commit d7d09a91df
No known key found for this signature in database
GPG key ID: 8C6E5FEB5FC03CCC
3 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
editor/docks/editor_dock_manager.cpp
View file

@ -955,6 +955,7 @@ void EditorDockManager::register_dock_slot(DockConstants::DockSlot p_dock_slot,
slot.container = p_tab_container;
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));
p_tab_container->get_tab_bar()->set_switch_on_release(true);
p_tab_container->get_tab_bar()->connect("tab_rmb_clicked", callable_mp(this, &EditorDockManager::_dock_container_popup).bind(p_tab_container));
p_tab_container->set_drag_to_rearrange_enabled(true);
p_tab_container->set_tabs_rearrange_group(1);

2
scene/gui/tab_bar.cpp
View file

@ -223,7 +223,7 @@ void TabBar::gui_input(const Ref<InputEvent> &p_event) {
}
}
if (mb->is_pressed()) {
if (mb->is_pressed() != switch_on_release) {
Point2 pos = mb->get_position();
bool selecting = mb->get_button_index() == MouseButton::LEFT || (select_with_rmb && mb->get_button_index() == MouseButton::RIGHT);

3
scene/gui/tab_bar.h
View file

@ -119,6 +119,7 @@ private:
bool select_with_rmb = false;
bool deselect_enabled = false;
bool switch_on_release = false;
int cb_hover = -1;
bool cb_pressing = false;
@ -329,6 +330,8 @@ public:
void set_max_tab_width(int p_width);
int get_max_tab_width() const;
void set_switch_on_release(bool p_switch) { switch_on_release = p_switch; }
Rect2 get_tab_rect(int p_tab) const;
Size2 get_minimum_size() const override;