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

Spatial/Canvas Editor: Ignore unhandled input if there is a dialog

Browse source
This commit is contained in:
Ignacio Etcheverry 2016-01-15 11:37:45 +01:00
parent ccbf8b42f4
commit e187762c2d
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -194,7 +194,7 @@ void CanvasItemEditor::_edit_set_pivot(const Vector2& mouse_pos) {
void CanvasItemEditor::_unhandled_key_input(const InputEvent& p_ev) {
if (!is_visible())
if (!is_visible() || window_has_modal_stack())
return;
if (p_ev.key.mod.control)
// prevent to change tool mode when control key is pressed

4
tools/editor/plugins/spatial_editor_plugin.cpp
View file

@ -3529,10 +3529,10 @@ void SpatialEditor::_instance_scene() {
void SpatialEditor::_unhandled_key_input(InputEvent p_event) {
if (!is_visible())
if (!is_visible() || window_has_modal_stack())
return;
{
{
EditorNode *en = editor;
EditorPlugin *over_plugin = en->get_editor_plugin_over();