From d7846082a3e509bec76f2c51a642aecd97f8b65b Mon Sep 17 00:00:00 2001 From: Kah Wei Date: Thu, 23 Feb 2023 13:32:00 +0800 Subject: [PATCH] Fixed incorrect managed functions being called for new button events --- SHADE_Engine/src/Scripting/SHScriptEngine.cpp | 6 +++--- SHADE_Managed/src/Components/UIElement.cxx | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/SHADE_Engine/src/Scripting/SHScriptEngine.cpp b/SHADE_Engine/src/Scripting/SHScriptEngine.cpp index 36d34b6c..d63db50d 100644 --- a/SHADE_Engine/src/Scripting/SHScriptEngine.cpp +++ b/SHADE_Engine/src/Scripting/SHScriptEngine.cpp @@ -372,21 +372,21 @@ namespace SHADE SHEventHandle SHScriptEngine::onUIElementReleased(SHEventPtr eventPtr) { auto eventData = reinterpret_cast*>(eventPtr.get()); - csUIElementOnClicked(eventData->data->EID); + csUIElementOnRemoved(eventData->data->EID); return eventData->handle; } SHEventHandle SHScriptEngine::onUIElementOnHoverEntered(SHEventPtr eventPtr) { auto eventData = reinterpret_cast*>(eventPtr.get()); - csUIElementOnClicked(eventData->data->EID); + csUIElementOnHoverEntered(eventData->data->EID); return eventData->handle; } SHEventHandle SHScriptEngine::onUIElementOnHoverExited(SHEventPtr eventPtr) { auto eventData = reinterpret_cast*>(eventPtr.get()); - csUIElementOnClicked(eventData->data->EID); + csUIElementOnHoverExited(eventData->data->EID); return eventData->handle; } diff --git a/SHADE_Managed/src/Components/UIElement.cxx b/SHADE_Managed/src/Components/UIElement.cxx index 75e16a1c..cc854bd2 100644 --- a/SHADE_Managed/src/Components/UIElement.cxx +++ b/SHADE_Managed/src/Components/UIElement.cxx @@ -143,7 +143,7 @@ namespace SHADE { onReleasedEventMap[entity]->Invoke(); } - SAFE_NATIVE_CALL_END("UIElement.OnClicked") + SAFE_NATIVE_CALL_END("UIElement.OnReleased") } void UIElement::OnHoverEntered(EntityID entity) { @@ -153,7 +153,7 @@ namespace SHADE { onHoverEnterEventMap[entity]->Invoke(); } - SAFE_NATIVE_CALL_END("UIElement.OnClicked") + SAFE_NATIVE_CALL_END("UIElement.OnHoverEntered") } void UIElement::OnHoverExited(EntityID entity) { @@ -163,6 +163,6 @@ namespace SHADE { onHoverExitEventMap[entity]->Invoke(); } - SAFE_NATIVE_CALL_END("UIElement.OnClicked") + SAFE_NATIVE_CALL_END("UIElement.OnHoverExited") } }