Reimplement button hover, go button
This commit is contained in:
@@ -3,7 +3,7 @@
|
||||
#include "../Instance.h"
|
||||
#include "../../MenuActions.h"
|
||||
|
||||
namespace B3D{
|
||||
namespace B3D {
|
||||
class BaseButtonInstance : public Instance
|
||||
{
|
||||
public:
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user