Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-02-21 22:52:52 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #11347 from unknownbrackets/save-minor

Browse Source 
Savedata: Show confirm save without faded icon
This commit is contained in:
Henrik Rydgård 2018-09-02 21:33:41 +02:00 committed by GitHub
commit caaec8c4cc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Core/Dialog/PSPSaveDialog.cpp
View File

@ -362,13 +362,13 @@ void PSPSaveDialog::DisplaySaveList(bool canMove) {
} }
} }
void PSPSaveDialog::DisplaySaveIcon() void PSPSaveDialog::DisplaySaveIcon(bool checkExists)
{ {
std::lock_guard<std::mutex> guard(paramLock); std::lock_guard<std::mutex> guard(paramLock);
int textureColor = CalcFadedColor(0xFFFFFFFF); int textureColor = CalcFadedColor(0xFFFFFFFF);
auto curSave = param.GetFileInfo(currentSelectedSave); auto curSave = param.GetFileInfo(currentSelectedSave);
if (curSave.size == 0) if (curSave.size == 0 && checkExists)
textureColor = CalcFadedColor(0xFF777777); textureColor = CalcFadedColor(0xFF777777);
// Calc save image position on screen // Calc save image position on screen
@ -652,7 +652,7 @@ int PSPSaveDialog::Update(int animSpeed)
case DS_SAVE_CONFIRM: case DS_SAVE_CONFIRM:
StartDraw(); StartDraw();
DisplaySaveIcon(); DisplaySaveIcon(false);
DisplaySaveDataInfo2(true); DisplaySaveDataInfo2(true);
DisplayMessage(di->T("Confirm Save", "Do you want to save this data?"), true); DisplayMessage(di->T("Confirm Save", "Do you want to save this data?"), true);
@ -673,7 +673,7 @@ int PSPSaveDialog::Update(int animSpeed)
case DS_SAVE_CONFIRM_OVERWRITE: case DS_SAVE_CONFIRM_OVERWRITE:
StartDraw(); StartDraw();
DisplaySaveIcon(); DisplaySaveIcon(true);
DisplaySaveDataInfo2(); DisplaySaveDataInfo2();
DisplayMessage(di->T("Confirm Overwrite","Do you want to overwrite the data?"), true); DisplayMessage(di->T("Confirm Overwrite","Do you want to overwrite the data?"), true);
@ -702,7 +702,7 @@ int PSPSaveDialog::Update(int animSpeed)
StartDraw(); StartDraw();
DisplaySaveIcon(); DisplaySaveIcon(true);
DisplaySaveDataInfo2(true); DisplaySaveDataInfo2(true);
DisplayMessage(di->T("Saving","Saving\nPlease Wait...")); DisplayMessage(di->T("Saving","Saving\nPlease Wait..."));
@ -715,7 +715,7 @@ int PSPSaveDialog::Update(int animSpeed)
JoinIOThread(); JoinIOThread();
StartDraw(); StartDraw();
DisplaySaveIcon(); DisplaySaveIcon(true);
DisplaySaveDataInfo2(true); DisplaySaveDataInfo2(true);
DisplayMessage(di->T("SavingFailed", "Unable to save data.")); DisplayMessage(di->T("SavingFailed", "Unable to save data."));
@ -742,7 +742,7 @@ int PSPSaveDialog::Update(int animSpeed)
} }
StartDraw(); StartDraw();
DisplaySaveIcon(); DisplaySaveIcon(true);
DisplaySaveDataInfo2(true); DisplaySaveDataInfo2(true);
DisplayMessage(di->T("Save completed")); DisplayMessage(di->T("Save completed"));
@ -782,7 +782,7 @@ int PSPSaveDialog::Update(int animSpeed)
case DS_LOAD_CONFIRM: case DS_LOAD_CONFIRM:
StartDraw(); StartDraw();
DisplaySaveIcon(); DisplaySaveIcon(true);
DisplaySaveDataInfo2(); DisplaySaveDataInfo2();
DisplayMessage(di->T("ConfirmLoad", "Load this data?"), true); DisplayMessage(di->T("ConfirmLoad", "Load this data?"), true);
@ -807,7 +807,7 @@ int PSPSaveDialog::Update(int animSpeed)
StartDraw(); StartDraw();
DisplaySaveIcon(); DisplaySaveIcon(true);
DisplaySaveDataInfo2(); DisplaySaveDataInfo2();
DisplayMessage(di->T("Loading","Loading\nPlease Wait...")); DisplayMessage(di->T("Loading","Loading\nPlease Wait..."));
@ -820,7 +820,7 @@ int PSPSaveDialog::Update(int animSpeed)
JoinIOThread(); JoinIOThread();
StartDraw(); StartDraw();
DisplaySaveIcon(); DisplaySaveIcon(true);
DisplaySaveDataInfo2(); DisplaySaveDataInfo2();
DisplayMessage(di->T("LoadingFailed", "Unable to load data.")); DisplayMessage(di->T("LoadingFailed", "Unable to load data."));
@ -844,7 +844,7 @@ int PSPSaveDialog::Update(int animSpeed)
JoinIOThread(); JoinIOThread();
StartDraw(); StartDraw();
DisplaySaveIcon(); DisplaySaveIcon(true);
DisplaySaveDataInfo2(); DisplaySaveDataInfo2();
DisplayMessage(di->T("Load completed")); DisplayMessage(di->T("Load completed"));
@ -902,7 +902,7 @@ int PSPSaveDialog::Update(int animSpeed)
case DS_DELETE_CONFIRM: case DS_DELETE_CONFIRM:
StartDraw(); StartDraw();
DisplaySaveIcon(); DisplaySaveIcon(true);
DisplaySaveDataInfo2(); DisplaySaveDataInfo2();
DisplayMessage(di->T("DeleteConfirm", DisplayMessage(di->T("DeleteConfirm",

2
Core/Dialog/PSPSaveDialog.h
View File

@ -90,7 +90,7 @@ private:
void DisplayBanner(int which); void DisplayBanner(int which);
void DisplaySaveList(bool canMove = true); void DisplaySaveList(bool canMove = true);
void DisplaySaveIcon(); void DisplaySaveIcon(bool checkExists);
void DisplaySaveDataInfo1(); void DisplaySaveDataInfo1();
void DisplaySaveDataInfo2(bool showNewData = false); void DisplaySaveDataInfo2(bool showNewData = false);
void DisplayMessage(std::string text, bool hasYesNo = false); void DisplayMessage(std::string text, bool hasYesNo = false);