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

Merge pull request #4258 from neikeq/pr-imp-canvas-select

Browse source 
Avoid selecting items from instanced scenes in CanvasItemEditorPlugin
This commit is contained in:
Rémi Verschelde 2016-04-07 14:12:44 +02:00
commit 823e87baee
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
tools/editor/plugins/canvas_item_editor_plugin.cpp
View file

@ -39,6 +39,7 @@
#include "scene/gui/grid_container.h"
#include "tools/editor/animation_editor.h"
#include "tools/editor/plugins/animation_player_editor_plugin.h"
#include "scene/resources/packed_scene.h"
class SnapDialog : public ConfirmationDialog {
@ -415,6 +416,14 @@ void CanvasItemEditor::_keying_changed() {
animation_hb->hide();
}
bool CanvasItemEditor::_is_part_of_subscene(CanvasItem *p_item) {
Node* scene_node = get_tree()->get_edited_scene_root();
Node* item_owner = p_item->get_owner();
return item_owner && item_owner!=scene_node && p_item!=scene_node && item_owner->get_filename()!="";
}
// slow but modern computers should have no problem
CanvasItem* CanvasItemEditor::_select_canvas_item_at_pos(const Point2& p_pos,Node* p_node,const Matrix32& p_parent_xform,const Matrix32& p_canvas_xform) {
@ -441,8 +450,7 @@ CanvasItem* CanvasItemEditor::_select_canvas_item_at_pos(const Point2& p_pos,Nod
return r;
}
if (c && c->is_visible() && !c->has_meta("_edit_lock_") && !c->cast_to<CanvasLayer>()) {
if (c && c->is_visible() && !c->has_meta("_edit_lock_") && !_is_part_of_subscene(c) && !c->cast_to<CanvasLayer>()) {
Rect2 rect = c->get_item_rect();
Point2 local_pos = (p_parent_xform * p_canvas_xform * c->get_transform()).affine_inverse().xform(p_pos);

1
tools/editor/plugins/canvas_item_editor_plugin.h
View file

@ -295,6 +295,7 @@ class CanvasItemEditor : public VBoxContainer {
int handle_len;
bool _is_part_of_subscene(CanvasItem *p_item);
CanvasItem* _select_canvas_item_at_pos(const Point2 &p_pos,Node* p_node,const Matrix32& p_parent_xform,const Matrix32& p_canvas_xform);
void _find_canvas_items_at_pos(const Point2 &p_pos,Node* p_node,const Matrix32& p_parent_xform,const Matrix32& p_canvas_xform, Vector<_SelectResult> &r_items);
void _find_canvas_items_at_rect(const Rect2& p_rect,Node* p_node,const Matrix32& p_parent_xform,const Matrix32& p_canvas_xform,List<CanvasItem*> *r_items);