godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make Scene dock menu button an actual MenuButton

Browse Source
This commit is contained in:
Michael Alexsander 2022-01-20 08:54:36 -03:00
parent 65c3f2c049
commit b3a82f8310
2 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
editor/scene_tree_dock.cpp
View File

@ -2809,15 +2809,9 @@ void SceneTreeDock::_tree_rmb(const Vector2 &p_menu_pos) {
menu->popup(); menu->popup();
} }
void SceneTreeDock::_open_tree_menu() { void SceneTreeDock::_update_tree_menu() {
menu->clear(); PopupMenu *tree_menu = button_tree_menu->get_popup();
tree_menu->set_item_checked(tree_menu->get_item_idx_from_text(TTR("Auto Expand to Selected")), EditorSettings::get_singleton()->get("docks/scene_tree/auto_expand_to_selected"));
menu->add_check_item(TTR("Auto Expand to Selected"), TOOL_AUTO_EXPAND);
menu->set_item_checked(menu->get_item_idx_from_text(TTR("Auto Expand to Selected")), EditorSettings::get_singleton()->get("docks/scene_tree/auto_expand_to_selected"));
menu->reset_size();
menu->set_position(get_screen_position() + get_local_mouse_position());
menu->popup();
} }
void SceneTreeDock::_filter_changed(const String &p_filter) { void SceneTreeDock::_filter_changed(const String &p_filter) {
@ -3370,11 +3364,15 @@ SceneTreeDock::SceneTreeDock(EditorNode *p_editor, Node *p_scene_root, EditorSel
filter_hbc->add_child(button_detach_script); filter_hbc->add_child(button_detach_script);
button_detach_script->hide(); button_detach_script->hide();
button_tree_menu = memnew(Button); button_tree_menu = memnew(MenuButton);
button_tree_menu->set_flat(true); button_tree_menu->set_flat(true);
button_tree_menu->connect("pressed", callable_mp(this, &SceneTreeDock::_open_tree_menu)); button_tree_menu->connect("about_to_popup", callable_mp(this, &SceneTreeDock::_update_tree_menu));
filter_hbc->add_child(button_tree_menu); filter_hbc->add_child(button_tree_menu);
PopupMenu *tree_menu = button_tree_menu->get_popup();
tree_menu->add_check_item(TTR("Auto Expand to Selected"), TOOL_AUTO_EXPAND);
tree_menu->connect("id_pressed", callable_mp(this, &SceneTreeDock::_tool_selected), make_binds(false));
button_hb = memnew(HBoxContainer); button_hb = memnew(HBoxContainer);
vbc->add_child(button_hb); vbc->add_child(button_hb);

4
editor/scene_tree_dock.h
View File

@ -117,7 +117,7 @@ class SceneTreeDock : public VBoxContainer {
Button *button_instance; Button *button_instance;
Button *button_create_script; Button *button_create_script;
Button *button_detach_script; Button *button_detach_script;
Button *button_tree_menu; MenuButton *button_tree_menu;
Button *button_2d; Button *button_2d;
Button *button_3d; Button *button_3d;
@ -242,7 +242,7 @@ class SceneTreeDock : public VBoxContainer {
void _quick_open(); void _quick_open();
void _tree_rmb(const Vector2 &p_menu_pos); void _tree_rmb(const Vector2 &p_menu_pos);
void _open_tree_menu(); void _update_tree_menu();
void _filter_changed(const String &p_filter); void _filter_changed(const String &p_filter);