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

Merge pull request #3356 from neikeq/qwe_dialog 

Spatial/Canvas Editor: Ignore unhandled input if there is a dialog
This commit is contained in:
Rémi Verschelde 2016-01-15 12:17:06 +01:00
parent 698b338bc8 e187762c2d
commit bbeac36cb5
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();