The-Homebrew-Cloud/libgui
2
0
Fork 0
mirror of https://github.com/wiiu-env/libgui.git synced 2025-01-12 00:09:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

add state support for all 5 channels

Browse Source
This commit is contained in:
GaryOderNichts 2020-04-24 12:32:30 +02:00
parent 3597fdcd22
commit 79675c9426
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
include/gui/GuiElement.h
View File

@ -241,30 +241,30 @@ public:
//!\param s State (STATE_DEFAULT, STATE_SELECTED, STATE_CLICKED, STATE_DISABLED) //!\param s State (STATE_DEFAULT, STATE_SELECTED, STATE_CLICKED, STATE_DISABLED)
//!\param c Controller channel (0-3, -1 = none) //!\param c Controller channel (0-3, -1 = none)
virtual void setState(int32_t s, int32_t c = -1) { virtual void setState(int32_t s, int32_t c = -1) {
if(c >= 0 && c < 4) { if(c >= 0 && c < 5) {
state[c] |= s; state[c] |= s;
} else { } else {
for(int32_t i = 0; i < 4; i++) for(int32_t i = 0; i < 5; i++)
state[i] |= s; state[i] |= s;
} }
stateChan = c; stateChan = c;
stateChanged(this, s, c); stateChanged(this, s, c);
} }
virtual void clearState(int32_t s, int32_t c = -1) { virtual void clearState(int32_t s, int32_t c = -1) {
if(c >= 0 && c < 4) { if(c >= 0 && c < 5) {
state[c] &= ~s; state[c] &= ~s;
} else { } else {
for(int32_t i = 0; i < 4; i++) for(int32_t i = 0; i < 5; i++)
state[i] &= ~s; state[i] &= ~s;
} }
stateChan = c; stateChan = c;
stateChanged(this, s, c); stateChanged(this, s, c);
} }
virtual bool isStateSet(int32_t s, int32_t c = -1) const { virtual bool isStateSet(int32_t s, int32_t c = -1) const {
if(c >= 0 && c < 4) { if(c >= 0 && c < 5) {
return (state[c] & s) != 0; return (state[c] & s) != 0;
} else { } else {
for(int32_t i = 0; i < 4; i++) for(int32_t i = 0; i < 5; i++)
if((state[i] & s) != 0) if((state[i] & s) != 0)
return true; return true;
@ -283,7 +283,7 @@ public:
}; };
//!Resets the element's state to STATE_DEFAULT //!Resets the element's state to STATE_DEFAULT
virtual void resetState() { virtual void resetState() {
for(int32_t i = 0; i < 4; i++) for(int32_t i = 0; i < 5; i++)
state[i] = STATE_DEFAULT; state[i] = STATE_DEFAULT;
stateChan = -1; stateChan = -1;
} }
@ -519,7 +519,7 @@ protected:
float scaleY; //!< Element scale (1 = 100%) float scaleY; //!< Element scale (1 = 100%)
float scaleZ; //!< Element scale (1 = 100%) float scaleZ; //!< Element scale (1 = 100%)
int32_t alignment; //!< Horizontal element alignment, respective to parent element int32_t alignment; //!< Horizontal element alignment, respective to parent element
int32_t state[4]; //!< Element state (DEFAULT, SELECTED, CLICKED, DISABLED) int32_t state[5]; //!< Element state (DEFAULT, SELECTED, CLICKED, DISABLED)
int32_t stateChan; //!< Which controller channel is responsible for the last change in state int32_t stateChan; //!< Which controller channel is responsible for the last change in state
GuiElement * parentElement; //!< Parent element GuiElement * parentElement; //!< Parent element

2
source/gui/GuiElement.cpp
View File

@ -33,7 +33,7 @@ GuiElement::GuiElement() {
scaleX = 1.0f; scaleX = 1.0f;
scaleY = 1.0f; scaleY = 1.0f;
scaleZ = 1.0f; scaleZ = 1.0f;
for(int32_t i = 0; i < 4; i++) for(int32_t i = 0; i < 5; i++)
state[i] = STATE_DEFAULT; state[i] = STATE_DEFAULT;
stateChan = -1; stateChan = -1;
parentElement = NULL; parentElement = NULL;