From cd735f6c62a70a70cb483288d96536af0784cc82 Mon Sep 17 00:00:00 2001 From: Vulpovile Date: Tue, 8 Apr 2025 18:37:43 -0700 Subject: [PATCH] Reimplement button hover, go button --- src/include/DataModelV3/Gui/BaseButtonInstance.h | 2 +- src/source/DataModelV3/Gui/BaseButtonInstance.cpp | 4 ++-- src/source/MenuActions.cpp | 5 +++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/include/DataModelV3/Gui/BaseButtonInstance.h b/src/include/DataModelV3/Gui/BaseButtonInstance.h index 1d1e8cc..82bc43b 100644 --- a/src/include/DataModelV3/Gui/BaseButtonInstance.h +++ b/src/include/DataModelV3/Gui/BaseButtonInstance.h @@ -3,7 +3,7 @@ #include "../Instance.h" #include "../../MenuActions.h" -namespace B3D{ +namespace B3D { class BaseButtonInstance : public Instance { public: diff --git a/src/source/DataModelV3/Gui/BaseButtonInstance.cpp b/src/source/DataModelV3/Gui/BaseButtonInstance.cpp index 68ca6f4..ae427ab 100644 --- a/src/source/DataModelV3/Gui/BaseButtonInstance.cpp +++ b/src/source/DataModelV3/Gui/BaseButtonInstance.cpp @@ -1,4 +1,5 @@ #include "DataModelV3/Gui/BaseButtonInstance.h" +#include "Application.h" using namespace B3D; BaseButtonInstance::BaseButtonInstance(void) : Instance() @@ -10,8 +11,7 @@ BaseButtonInstance::BaseButtonInstance(void) : Instance() void BaseButtonInstance::render(RenderDevice* rd) { //TODO make mouse a member of datamodel - //Vector2 pos = Vector2(g_usableApp->mouse.x,g_usableApp->mouse.y); - drawObj(rd, Vector2(0, 0), false);//g_usableApp->mouse.isMouseDown()); + drawObj(rd, Vector2(g_usableApp->mouse.x, g_usableApp->mouse.y), g_usableApp->mouse.isMouseDown());//g_usableApp->mouse.isMouseDown()); Instance::render(rd); } diff --git a/src/source/MenuActions.cpp b/src/source/MenuActions.cpp index a2c7891..c2fdd48 100755 --- a/src/source/MenuActions.cpp +++ b/src/source/MenuActions.cpp @@ -1,10 +1,11 @@ #include "MenuActions.h" - +#include "DataModelV3/Gui/ToggleImageButtonInstance.h" void menuCallback(const ActionParam &actionParam) { switch(actionParam.actionCode) { case MENUBTN_GO: - actionParam.dataModel->toggleRun(); + actionParam.dataModel->toggleRun(); //SHOULD USE C++ STYLE CASTING BUT IDC RN + ((ToggleImageButtonInstance*)actionParam.caller)->checked = actionParam.dataModel->isRunning(); break; } }