mirror of
https://github.com/wiidev/usbloadergx.git
synced 2024-12-19 00:11:55 +01:00
Hopefully fixed erratic click detection in settings.
This commit is contained in:
parent
f967270d4b
commit
20cb3c9e93
@ -129,7 +129,7 @@ GuiCustomOptionBrowser::GuiCustomOptionBrowser(int w, int h, customOptionList *
|
|||||||
optionVal[i]->SetAlignment(ALIGN_LEFT, ALIGN_MIDDLE);
|
optionVal[i]->SetAlignment(ALIGN_LEFT, ALIGN_MIDDLE);
|
||||||
optionVal[i]->SetPosition(250,0);
|
optionVal[i]->SetPosition(250,0);
|
||||||
|
|
||||||
optionBtn[i] = new GuiButton(width-28,GAMESELECTSIZE);
|
optionBtn[i] = new GuiButton(width,GAMESELECTSIZE);//(width-28,GAMESELECTSIZE);
|
||||||
optionBtn[i]->SetParent(this);
|
optionBtn[i]->SetParent(this);
|
||||||
optionBtn[i]->SetLabel(optionTxt[i], 0);
|
optionBtn[i]->SetLabel(optionTxt[i], 0);
|
||||||
optionBtn[i]->SetLabel(optionVal[i], 1);
|
optionBtn[i]->SetLabel(optionVal[i], 1);
|
||||||
@ -138,6 +138,7 @@ GuiCustomOptionBrowser::GuiCustomOptionBrowser(int w, int h, customOptionList *
|
|||||||
optionBtn[i]->SetRumble(false);
|
optionBtn[i]->SetRumble(false);
|
||||||
optionBtn[i]->SetTrigger(trigA);
|
optionBtn[i]->SetTrigger(trigA);
|
||||||
optionBtn[i]->SetSoundClick(btnSoundClick);
|
optionBtn[i]->SetSoundClick(btnSoundClick);
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -3277,6 +3277,7 @@ static int MenuSettings()
|
|||||||
settingsbackgroundbtn.SetAlignment(ALIGN_LEFT, ALIGN_TOP);
|
settingsbackgroundbtn.SetAlignment(ALIGN_LEFT, ALIGN_TOP);
|
||||||
settingsbackgroundbtn.SetPosition(0, 0);
|
settingsbackgroundbtn.SetPosition(0, 0);
|
||||||
settingsbackgroundbtn.SetImage(&settingsbackground);
|
settingsbackgroundbtn.SetImage(&settingsbackground);
|
||||||
|
settingsbackgroundbtn.SetTrigger(&trigA);
|
||||||
|
|
||||||
GuiText backBtnTxt("Go Back", 22, (GXColor){0, 0, 0, 255});
|
GuiText backBtnTxt("Go Back", 22, (GXColor){0, 0, 0, 255});
|
||||||
backBtnTxt.SetMaxWidth(btnOutline.GetWidth()-30);
|
backBtnTxt.SetMaxWidth(btnOutline.GetWidth()-30);
|
||||||
@ -3349,7 +3350,7 @@ static int MenuSettings()
|
|||||||
GuiCustomOptionBrowser optionBrowser2(396, 280, &options2, CFG.theme_path, "bg_options_settings", bg_options_settings_png, 0);
|
GuiCustomOptionBrowser optionBrowser2(396, 280, &options2, CFG.theme_path, "bg_options_settings", bg_options_settings_png, 0);
|
||||||
optionBrowser2.SetPosition(0, 90);
|
optionBrowser2.SetPosition(0, 90);
|
||||||
optionBrowser2.SetAlignment(ALIGN_CENTRE, ALIGN_TOP);
|
optionBrowser2.SetAlignment(ALIGN_CENTRE, ALIGN_TOP);
|
||||||
optionBrowser2.SetCol2Position(150);
|
optionBrowser2.SetCol2Position(180);
|
||||||
GuiWindow w(screenwidth, screenheight);
|
GuiWindow w(screenwidth, screenheight);
|
||||||
|
|
||||||
int pageToDisplay = 1;
|
int pageToDisplay = 1;
|
||||||
@ -3675,6 +3676,10 @@ static int MenuSettings()
|
|||||||
}
|
}
|
||||||
lockBtn.ResetState();
|
lockBtn.ResetState();
|
||||||
}
|
}
|
||||||
|
if(settingsbackgroundbtn.GetState() == STATE_CLICKED)
|
||||||
|
{
|
||||||
|
optionBrowser2.SetFocus(1);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user