diff options
| author | Rémi Verschelde | 2016-01-15 12:17:06 +0100 |
|---|---|---|
| committer | Rémi Verschelde | 2016-01-15 12:17:06 +0100 |
| commit | bbeac36cb59bfbec6cc14e2448093952f93a6355 (patch) | |
| tree | 17a3db6aff02d3424334b5d888fd711ddb878052 /tools/editor/plugins/canvas_item_editor_plugin.cpp | |
| parent | 698b338bc8e98d98a0ba903b06f8db55855e4cfb (diff) | |
| parent | e187762c2d9c73650a84f633aab83d447e725d3e (diff) | |
| download | godot-bbeac36cb59bfbec6cc14e2448093952f93a6355.tar.gz godot-bbeac36cb59bfbec6cc14e2448093952f93a6355.tar.zst godot-bbeac36cb59bfbec6cc14e2448093952f93a6355.zip | |
Merge pull request #3356 from neikeq/qwe_dialog
Spatial/Canvas Editor: Ignore unhandled input if there is a dialog
Diffstat (limited to 'tools/editor/plugins/canvas_item_editor_plugin.cpp')
| -rw-r--r-- | tools/editor/plugins/canvas_item_editor_plugin.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/editor/plugins/canvas_item_editor_plugin.cpp b/tools/editor/plugins/canvas_item_editor_plugin.cpp index 56ed95fb1..2eaf017d0 100644 --- a/tools/editor/plugins/canvas_item_editor_plugin.cpp +++ b/tools/editor/plugins/canvas_item_editor_plugin.cpp @@ -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 |