asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Don't handle pending clicks outside scene tree

Browse source
This commit is contained in:
kobewi 2022-06-10 15:14:31 +02:00
parent 9b014c49ba
commit ec6bbd486f
2 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
editor/scene_tree_dock.cpp
View file

@ -71,11 +71,19 @@ void SceneTreeDock::input(const Ref<InputEvent> &p_event) {
Ref<InputEventMouseButton> mb = p_event; Ref<InputEventMouseButton> mb = p_event;
if (pending_click_select && mb.is_valid() && !mb->is_pressed() && (mb->get_button_index() == MouseButton::LEFT || mb->get_button_index() == MouseButton::RIGHT)) { if (mb.is_valid() && (mb->get_button_index() == MouseButton::LEFT || mb->get_button_index() == MouseButton::RIGHT)) {
if (mb->is_pressed() && scene_tree->get_rect().has_point(mb->get_position())) {
tree_clicked = true;
} else if (!mb->is_pressed()) {
tree_clicked = false;
}
if (!mb->is_pressed() && pending_click_select) {
_push_item(pending_click_select); _push_item(pending_click_select);
pending_click_select = nullptr; pending_click_select = nullptr;
} }
} }
}
void SceneTreeDock::shortcut_input(const Ref<InputEvent> &p_event) { void SceneTreeDock::shortcut_input(const Ref<InputEvent> &p_event) {
ERR_FAIL_COND(p_event.is_null()); ERR_FAIL_COND(p_event.is_null());
@ -1371,10 +1379,10 @@ void SceneTreeDock::_push_item(Object *p_object) {
} }
void SceneTreeDock::_handle_select(Node *p_node) { void SceneTreeDock::_handle_select(Node *p_node) {
if ((Input::get_singleton()->get_mouse_button_mask() & (MouseButton::MASK_LEFT | MouseButton::MASK_RIGHT)) != MouseButton::NONE) { if (tree_clicked) {
pending_click_select = p_node; pending_click_select = p_node;
} else { } else {
EditorNode::get_singleton()->push_item(p_node); _push_item(p_node);
} }
} }

1
editor/scene_tree_dock.h
View file

@ -172,6 +172,7 @@ class SceneTreeDock : public VBoxContainer {
Node *scene_root = nullptr; Node *scene_root = nullptr;
Node *edited_scene = nullptr; Node *edited_scene = nullptr;
Node *pending_click_select = nullptr; Node *pending_click_select = nullptr;
bool tree_clicked = false;
VBoxContainer *create_root_dialog = nullptr; VBoxContainer *create_root_dialog = nullptr;
String selected_favorite_root; String selected_favorite_root;