AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of ssh+git://git.axiodl.com:6431/AxioDL/urde

This commit is contained in:
Phillip Stephens 2020-04-09 23:26:44 -07:00
parent 5f2ce02b05 1e6b6622fe
commit e13aa34509
Signed by: Antidote
GPG Key ID: F8BEE4C83DACA60D
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Runtime/GuiSys/CGuiFrame.cpp
View File

@ -195,7 +195,7 @@ void CGuiFrame::ProcessUserInput(const CFinalInput& input) const {
} }
} }
bool CGuiFrame::ProcessMouseInput(const CFinalInput& input, const CGuiWidgetDrawParms& parms) const { bool CGuiFrame::ProcessMouseInput(const CFinalInput& input, const CGuiWidgetDrawParms& parms) {
if (const auto& kbm = input.GetKBM()) { if (const auto& kbm = input.GetKBM()) {
zeus::CVector2f point(kbm->m_mouseCoord.norm[0] * 2.f - 1.f, zeus::CVector2f point(kbm->m_mouseCoord.norm[0] * 2.f - 1.f,
kbm->m_mouseCoord.norm[1] * 2.f - 1.f); kbm->m_mouseCoord.norm[1] * 2.f - 1.f);

10
Runtime/GuiSys/CGuiFrame.hpp
View File

@ -47,10 +47,10 @@ private:
float m_aspectConstraint = -1.f; float m_aspectConstraint = -1.f;
float m_maxAspect = -1.f; float m_maxAspect = -1.f;
mutable bool m_inMouseDown = false; bool m_inMouseDown = false;
mutable bool m_inCancel = false; bool m_inCancel = false;
mutable CGuiWidget* m_mouseDownWidget = nullptr; CGuiWidget* m_mouseDownWidget = nullptr;
mutable CGuiWidget* m_lastMouseOverWidget = nullptr; CGuiWidget* m_lastMouseOverWidget = nullptr;
std::function<void(CGuiWidget*, CGuiWidget*)> m_mouseOverChangeCb; std::function<void(CGuiWidget*, CGuiWidget*)> m_mouseOverChangeCb;
std::function<void(CGuiWidget*, bool)> m_mouseDownCb; std::function<void(CGuiWidget*, bool)> m_mouseDownCb;
std::function<void(CGuiWidget*, bool)> m_mouseUpCb; std::function<void(CGuiWidget*, bool)> m_mouseUpCb;
@ -102,7 +102,7 @@ public:
void Initialize(); void Initialize();
void LoadWidgetsInGame(CInputStream& in, CSimplePool* sp); void LoadWidgetsInGame(CInputStream& in, CSimplePool* sp);
void ProcessUserInput(const CFinalInput& input) const; void ProcessUserInput(const CFinalInput& input) const;
bool ProcessMouseInput(const CFinalInput& input, const CGuiWidgetDrawParms& parms) const; bool ProcessMouseInput(const CFinalInput& input, const CGuiWidgetDrawParms& parms);
void ResetMouseState(); void ResetMouseState();
CGuiWidgetIdDB& GetWidgetIdDB() { return x18_idDB; } CGuiWidgetIdDB& GetWidgetIdDB() { return x18_idDB; }