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

Merge pull request #33737 from KoBeWi/they_came_from_canvas

Browse source 
Cancel drag when selection changes
This commit is contained in:
Rémi Verschelde 2019-11-20 11:22:53 +01:00 committed by GitHub
commit bd94c94651
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
editor/plugins/canvas_item_editor_plugin.cpp
View file

@ -794,6 +794,7 @@ bool CanvasItemEditor::_select_click_on_item(CanvasItem *item, Point2 p_click_po
editor_selection->add_node(item);
// Reselect
if (Engine::get_singleton()->is_editor_hint()) {
selected_from_canvas = true;
editor->call("edit_node", item);
}
}
@ -3911,6 +3912,11 @@ void CanvasItemEditor::_selection_changed() {
}
anchors_mode = (nbValidControls == nbAnchorsMode);
anchor_mode_button->set_pressed(anchors_mode);
if (!selected_from_canvas) {
drag_type = DRAG_NONE;
}
selected_from_canvas = false;
}
void CanvasItemEditor::edit(CanvasItem *p_canvas_item) {
@ -5253,6 +5259,7 @@ CanvasItemEditor::CanvasItemEditor(EditorNode *p_editor) {
snap_target[0] = SNAP_TARGET_NONE;
snap_target[1] = SNAP_TARGET_NONE;
selected_from_canvas = false;
anchors_mode = false;
skeleton_show_bones = true;

1
editor/plugins/canvas_item_editor_plugin.h
View file

@ -252,6 +252,7 @@ private:
Point2 view_offset;
Point2 previous_update_view_offset;
bool selected_from_canvas;
bool anchors_mode;
Point2 grid_offset;