From bafd6d1d8d30d58f310f82c1fa25be2aa5d89910 Mon Sep 17 00:00:00 2001 From: Relintai Date: Sat, 20 Aug 2022 01:01:01 +0200 Subject: [PATCH] Renamed AFTER_GUI_INPUT_DESELECT to AFTER_GUI_INPUT_NO_DESELECT. --- editor/editor_node.cpp | 4 ++-- editor/editor_plugin.cpp | 2 +- editor/editor_plugin.h | 2 +- editor/plugins/spatial_editor_plugin.cpp | 12 ++++++------ .../skeleton_editor/skeleton_editor_plugin.cpp | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp index f6b844dac..902302b0b 100644 --- a/editor/editor_node.cpp +++ b/editor/editor_node.cpp @@ -7037,8 +7037,8 @@ EditorPlugin::AfterGUIInput EditorPluginList::forward_spatial_gui_input(Camera * after = EditorPlugin::AFTER_GUI_INPUT_STOP; } - if (after != EditorPlugin::AFTER_GUI_INPUT_STOP && current_after == EditorPlugin::AFTER_GUI_INPUT_DESELECT) { - after = EditorPlugin::AFTER_GUI_INPUT_DESELECT; + if (after != EditorPlugin::AFTER_GUI_INPUT_STOP && current_after == EditorPlugin::AFTER_GUI_INPUT_NO_DESELECT) { + after = EditorPlugin::AFTER_GUI_INPUT_NO_DESELECT; } } diff --git a/editor/editor_plugin.cpp b/editor/editor_plugin.cpp index 076a1a6a2..b89fb5a2d 100644 --- a/editor/editor_plugin.cpp +++ b/editor/editor_plugin.cpp @@ -947,7 +947,7 @@ void EditorPlugin::_bind_methods() { BIND_ENUM_CONSTANT(AFTER_GUI_INPUT_PASS); BIND_ENUM_CONSTANT(AFTER_GUI_INPUT_STOP); - BIND_ENUM_CONSTANT(AFTER_GUI_INPUT_DESELECT); + BIND_ENUM_CONSTANT(AFTER_GUI_INPUT_NO_DESELECT); } EditorPlugin::EditorPlugin() : diff --git a/editor/editor_plugin.h b/editor/editor_plugin.h index c3f7d1bcd..210fdcaf1 100644 --- a/editor/editor_plugin.h +++ b/editor/editor_plugin.h @@ -194,7 +194,7 @@ public: enum AfterGUIInput { AFTER_GUI_INPUT_PASS, AFTER_GUI_INPUT_STOP, - AFTER_GUI_INPUT_DESELECT + AFTER_GUI_INPUT_NO_DESELECT }; //TODO: send a resource for editing to the editor node? diff --git a/editor/plugins/spatial_editor_plugin.cpp b/editor/plugins/spatial_editor_plugin.cpp index e64ed1d2c..424bac046 100644 --- a/editor/plugins/spatial_editor_plugin.cpp +++ b/editor/plugins/spatial_editor_plugin.cpp @@ -1376,8 +1376,8 @@ void SpatialEditorViewport::_sinput(const Ref &p_event) { return; } - if (discard == EditorPlugin::AFTER_GUI_INPUT_DESELECT) { - after = EditorPlugin::AFTER_GUI_INPUT_DESELECT; + if (discard == EditorPlugin::AFTER_GUI_INPUT_NO_DESELECT) { + after = EditorPlugin::AFTER_GUI_INPUT_NO_DESELECT; } } } @@ -1391,8 +1391,8 @@ void SpatialEditorViewport::_sinput(const Ref &p_event) { return; } - if (discard == EditorPlugin::AFTER_GUI_INPUT_DESELECT) { - after = EditorPlugin::AFTER_GUI_INPUT_DESELECT; + if (discard == EditorPlugin::AFTER_GUI_INPUT_NO_DESELECT) { + after = EditorPlugin::AFTER_GUI_INPUT_NO_DESELECT; } } } @@ -1673,7 +1673,7 @@ void SpatialEditorViewport::_sinput(const Ref &p_event) { break; } - if (after != EditorPlugin::AFTER_GUI_INPUT_DESELECT) { + if (after != EditorPlugin::AFTER_GUI_INPUT_NO_DESELECT) { clicked = _select_ray(b->get_position()); //TODO is this needed? @@ -1699,7 +1699,7 @@ void SpatialEditorViewport::_sinput(const Ref &p_event) { break; } - if (after != EditorPlugin::AFTER_GUI_INPUT_DESELECT) { + if (after != EditorPlugin::AFTER_GUI_INPUT_NO_DESELECT) { if (clicked) { _select_clicked(false); } diff --git a/editor_modules/skeleton_editor/skeleton_editor_plugin.cpp b/editor_modules/skeleton_editor/skeleton_editor_plugin.cpp index 29bb4f24b..3d3bbc5a1 100644 --- a/editor_modules/skeleton_editor/skeleton_editor_plugin.cpp +++ b/editor_modules/skeleton_editor/skeleton_editor_plugin.cpp @@ -1277,7 +1277,7 @@ EditorPlugin::AfterGUIInput SkeletonEditorPlugin::forward_spatial_gui_input(Came se->update_bone_original(); } } - return EditorPlugin::AFTER_GUI_INPUT_DESELECT; + return EditorPlugin::AFTER_GUI_INPUT_NO_DESELECT; } return EditorPlugin::AFTER_GUI_INPUT_PASS; }