mirror of
https://github.com/dborth/fceugx.git
synced 2024-10-31 22:45:05 +01:00
more GUI logic corrections
This commit is contained in:
parent
42c3df4c06
commit
736a08b480
@ -226,10 +226,13 @@ void GuiButton::Update(GuiTrigger * t)
|
||||
{
|
||||
if(state == STATE_SELECTED)
|
||||
{
|
||||
this->SetState(STATE_CLICKED, t->chan);
|
||||
if(!t->wpad.ir.valid || this->IsInside(t->wpad.ir.x, t->wpad.ir.y))
|
||||
{
|
||||
this->SetState(STATE_CLICKED, t->chan);
|
||||
|
||||
if(soundClick)
|
||||
soundClick->Play();
|
||||
if(soundClick)
|
||||
soundClick->Play();
|
||||
}
|
||||
}
|
||||
else if(trigger[i]->type == TRIGGER_BUTTON_ONLY)
|
||||
{
|
||||
|
@ -357,13 +357,10 @@ void GuiFileBrowser::Update(GuiTrigger * t)
|
||||
}
|
||||
}
|
||||
|
||||
if(focus)
|
||||
{
|
||||
if(i != selectedItem && gameList[i]->GetState() == STATE_SELECTED)
|
||||
gameList[i]->ResetState();
|
||||
else if(i == selectedItem && gameList[i]->GetState() == STATE_DEFAULT)
|
||||
gameList[selectedItem]->SetState(STATE_SELECTED, t->chan);
|
||||
}
|
||||
if(i != selectedItem && gameList[i]->GetState() == STATE_SELECTED)
|
||||
gameList[i]->ResetState();
|
||||
else if(focus && i == selectedItem && gameList[i]->GetState() == STATE_DEFAULT)
|
||||
gameList[selectedItem]->SetState(STATE_SELECTED, t->chan);
|
||||
|
||||
int currChan = t->chan;
|
||||
|
||||
|
@ -261,13 +261,10 @@ void GuiOptionBrowser::Update(GuiTrigger * t)
|
||||
optionBtn[i]->SetState(STATE_DISABLED);
|
||||
}
|
||||
|
||||
if(focus)
|
||||
{
|
||||
if(i != selectedItem && optionBtn[i]->GetState() == STATE_SELECTED)
|
||||
optionBtn[i]->ResetState();
|
||||
else if(i == selectedItem && optionBtn[i]->GetState() == STATE_DEFAULT)
|
||||
optionBtn[selectedItem]->SetState(STATE_SELECTED, t->chan);
|
||||
}
|
||||
if(i != selectedItem && optionBtn[i]->GetState() == STATE_SELECTED)
|
||||
optionBtn[i]->ResetState();
|
||||
else if(focus && i == selectedItem && optionBtn[i]->GetState() == STATE_DEFAULT)
|
||||
optionBtn[selectedItem]->SetState(STATE_SELECTED, t->chan);
|
||||
|
||||
int currChan = t->chan;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user