Relintai/pandemonium_engine
1
0
Fork 0
mirror of https://github.com/Relintai/pandemonium_engine.git synced 2024-12-24 04:46:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Renamed AFTER_GUI_INPUT_DESELECT to AFTER_GUI_INPUT_NO_DESELECT.

Browse Source
This commit is contained in:
Relintai 2022-08-20 01:01:01 +02:00
parent a21352637e
commit bafd6d1d8d
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
editor/editor_node.cpp
View File

@ -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;
}
}

2
editor/editor_plugin.cpp
View File

@ -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() :

2
editor/editor_plugin.h
View File

@ -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?

12
editor/plugins/spatial_editor_plugin.cpp
View File

@ -1376,8 +1376,8 @@ void SpatialEditorViewport::_sinput(const Ref<InputEvent> &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<InputEvent> &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<InputEvent> &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<InputEvent> &p_event) {
break;
}
if (after != EditorPlugin::AFTER_GUI_INPUT_DESELECT) {
if (after != EditorPlugin::AFTER_GUI_INPUT_NO_DESELECT) {
if (clicked) {
_select_clicked(false);
}

2
editor_modules/skeleton_editor/skeleton_editor_plugin.cpp
View File

@ -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;
}