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

Merge pull request #17347 from Ranoller/patch-1 

FIX to broken item select list (zoom and RMB)
This commit is contained in:
Rémi Verschelde 2018-03-09 13:43:23 +01:00 committed by GitHub
parent 47addcf9d0 2aae6fc2ec
commit b842369442
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
editor/plugins/canvas_item_editor_plugin.cpp
View File

@ -1615,10 +1615,10 @@ bool CanvasItemEditor::_gui_input_select(const Ref<InputEvent> &p_event) {
if (drag_type == DRAG_NONE) { if (drag_type == DRAG_NONE) {
if (b.is_valid() && if (b.is_valid() &&
((b->get_button_index() == BUTTON_LEFT && b->get_alt() && tool == TOOL_SELECT) || ((b->get_button_index() == BUTTON_RIGHT && b->get_alt() && tool == TOOL_SELECT) ||
(b->get_button_index() == BUTTON_LEFT && tool == TOOL_LIST_SELECT))) { (b->get_button_index() == BUTTON_LEFT && tool == TOOL_LIST_SELECT))) {
// Popup the selection menu list // Popup the selection menu list
Point2 click = transform.xform(b->get_position()); Point2 click = transform.affine_inverse().xform(b->get_position());
Node *scene = editor->get_edited_scene(); Node *scene = editor->get_edited_scene();