CSPublic/Blocks3D
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Reimplement button hover, go button

Browse Source
This commit is contained in:
Vulpovile
2025-04-08 18:37:43 -07:00
parent 7c29d7ca9f
commit cd735f6c62
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/include/DataModelV3/Gui/BaseButtonInstance.h
View File

@@ -3,7 +3,7 @@
#include "../Instance.h" #include "../Instance.h"
#include "../../MenuActions.h" #include "../../MenuActions.h"
namespace B3D{ namespace B3D {
class BaseButtonInstance : public Instance class BaseButtonInstance : public Instance
{ {
public: public:

4
src/source/DataModelV3/Gui/BaseButtonInstance.cpp
View File

@@ -1,4 +1,5 @@
#include "DataModelV3/Gui/BaseButtonInstance.h" #include "DataModelV3/Gui/BaseButtonInstance.h"
#include "Application.h"
using namespace B3D; using namespace B3D;
BaseButtonInstance::BaseButtonInstance(void) : Instance() BaseButtonInstance::BaseButtonInstance(void) : Instance()
@@ -10,8 +11,7 @@ BaseButtonInstance::BaseButtonInstance(void) : Instance()
void BaseButtonInstance::render(RenderDevice* rd) void BaseButtonInstance::render(RenderDevice* rd)
{ {
//TODO make mouse a member of datamodel //TODO make mouse a member of datamodel
//Vector2 pos = Vector2(g_usableApp->mouse.x,g_usableApp->mouse.y); drawObj(rd, Vector2(g_usableApp->mouse.x, g_usableApp->mouse.y), g_usableApp->mouse.isMouseDown());//g_usableApp->mouse.isMouseDown());
drawObj(rd, Vector2(0, 0), false);//g_usableApp->mouse.isMouseDown());
Instance::render(rd); Instance::render(rd);
} }

5
src/source/MenuActions.cpp
View File

@@ -1,10 +1,11 @@
#include "MenuActions.h" #include "MenuActions.h"
#include "DataModelV3/Gui/ToggleImageButtonInstance.h"
void menuCallback(const ActionParam &actionParam) { void menuCallback(const ActionParam &actionParam) {
switch(actionParam.actionCode) { switch(actionParam.actionCode) {
case MENUBTN_GO: 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; break;
} }
} }