The-Homebrew-Cloud
/
SDL2_Playground
mirror of https://github.com/Maschell/SDL2_Playground.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GuiButton: Process children

This commit is contained in:
Maschell 2020-08-30 21:32:01 +02:00
parent 804aa6b7ce
commit 0ca699b4e7
2 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/gui/GuiButton.cpp
View File

@ -241,7 +241,7 @@ void GuiButton::update(GuiController *c) {
} else if ((isStateSet(STATE_CLICKED, c->chanIdx) || isStateSet(STATE_CLICKED_TOUCH, c->chanIdx)) && (clickedTrigger == trigger[i]) && !isStateSet(STATE_HELD, c->chanIdx) && !trigger[i]->held(c) &&
((isClicked == GuiTrigger::CLICKED_NONE) || trigger[i]->released(c))) {
if ((isStateSet(STATE_CLICKED_TOUCH, c->chanIdx) && this->isInside(c->data.x, c->data.y)) || (isStateSet(STATE_CLICKED, c->chanIdx))) {
clickedTrigger = NULL;
clickedTrigger = nullptr;
clearState(STATE_CLICKED, c->chanIdx);
released(this, c, trigger[i]);
}
@ -263,13 +263,34 @@ void GuiButton::update(GuiController *c) {
} else if (isStateSet(STATE_HELD, c->chanIdx) && (heldTrigger == trigger[i]) && (!isHeld || trigger[i]->released(c))) {
//! click is removed at this point and converted to held
if (clickedTrigger == trigger[i]) {
clickedTrigger = NULL;
clickedTrigger = nullptr;
clearState(STATE_CLICKED, c->chanIdx);
}
heldTrigger = NULL;
heldTrigger = nullptr;
clearState(STATE_HELD, c->chanIdx);
released(this, c, trigger[i]);
}
}
}
}
void GuiButton::process() {
GuiElement::process();
if(image) { image->process(); }
if(imageOver) { imageOver->process(); }
if(imageHold) { imageHold->process(); }
if(imageClick) { imageClick->process(); }
if(icon) { icon->process(); }
if(iconOver) { iconOver->process(); }
if(soundOver) { soundOver->process(); }
if(soundHold) { soundHold->process(); }
if(soundClick) { soundClick->process(); }
for(int i = 0;i<4;i++){
if(label[i]) { label[i]->process(); }
if(labelOver[i]) { labelOver[i]->process(); }
if(labelHold[i]) { labelHold[i]->process(); }
if(labelClick[i]) { labelClick[i]->process(); }
}
}

2
src/gui/GuiButton.h
View File

@ -100,6 +100,8 @@ public:
//!\param t Pointer to a GuiTrigger, containing the current input data from PAD/WPAD
void update(GuiController *c) override;
void process() override;
sigslot::signal2<GuiButton *, const GuiController *> selected;
sigslot::signal2<GuiButton *, const GuiController *> deSelected;
sigslot::signal2<GuiButton *, const GuiController *> pointedOn;