preserve-emulation/ppsspp
1
0 Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-10-25 03:09:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #756 from raven02/master

Browse Source 
Fix duplicate OK and ENTER button on same message screen
This commit is contained in:
Henrik Rydgård committed 2013-02-21 08:04:00 -08:00
2 parents e9e24b0371 643efb3cb9
commit e72ecec44e
1 file changed
+2 -9
Download Patch File Download Diff File Expand all files Collapse all files
Core/Dialog/PSPMsgDialog.cpp
+2 -9
View File
@@ -149,14 +149,9 @@ void PSPMsgDialog::DisplayYesNo()
}
void PSPMsgDialog::DisplayOk()
{
PPGeDrawText("OK", 250, 150, PPGE_ALIGN_LEFT, 0.5f, CalcFadedColor(0xFF0000FF));
}
void PSPMsgDialog::DisplayEnter()
{
PPGeDrawImage(okButtonImg, 200, 220, 20, 20, 0, CalcFadedColor(0xFFFFFFFF));
PPGeDrawText("Enter", 230, 220, PPGE_ALIGN_LEFT, 0.5f, CalcFadedColor(0xFFFFFFFF));
PPGeDrawText("Ok", 230, 220, PPGE_ALIGN_LEFT, 0.5f, CalcFadedColor(0xFFFFFFFF));
}
int PSPMsgDialog::Update()
@@ -196,11 +191,9 @@ int PSPMsgDialog::Update()
if(flag & DS_YESNO)
DisplayYesNo();
if(flag & DS_OK)
if (flag & (DS_OK | DS_VALIDBUTTON))
DisplayOk();
if(flag & DS_VALIDBUTTON)
DisplayEnter();
if(flag & DS_CANCELBUTTON)
DisplayBack();