preserve-emulation/ppsspp
1
0 Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-10-16 07:50:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix issue where the "background audio game" could get cleared by mistake.

Browse Source 
Takes care of the case of going to the game menu through Triangle.
This commit is contained in:
Henrik Rydgard committed 2014-06-22 18:16:36 +02:00
1 parent 3b55d1190d
commit fa3cdb0e3d
1 file changed
+9 -5
Download Patch File Download Diff File Expand all files Collapse all files
UI/MainScreen.cpp
+9 -5
View File
@@ -236,7 +236,8 @@ void GameButton::Draw(UIContext &dc) {
if (HasFocus()) {
dc.Draw()->Flush();
dc.RebindTexture();
dc.Draw()->DrawImage4Grid(dc.theme->dropShadow4Grid, x - dropsize*1.5f, y - dropsize*1.5f, x+w + dropsize*1.5f, y+h+dropsize*1.5f, alphaMul(color, 1.0f), 1.0f);
float pulse = sinf(time_now() * 7.0f) * 0.25 + 0.8;
dc.Draw()->DrawImage4Grid(dc.theme->dropShadow4Grid, x - dropsize*1.5f, y - dropsize*1.5f, x + w + dropsize*1.5f, y + h + dropsize*1.5f, alphaMul(color, pulse), 1.0f);
dc.Draw()->Flush();
} else {
dc.Draw()->Flush();
@@ -971,17 +972,18 @@ bool MainScreen::DrawBackgroundFor(UIContext &dc, const std::string &gamePath, f
}
UI::EventReturn MainScreen::OnGameSelected(UI::EventParams &e) {
#ifdef _WIN32
#ifdef _WIN32
std::string path = ReplaceAll(e.s, "\\", "/");
#else
std::string path = e.s;
#endif
SetBackgroundAudioGame(path);
screenManager()->push(new GameScreen(path));
return UI::EVENT_DONE;
}
UI::EventReturn MainScreen::OnGameHighlight(UI::EventParams &e) {
#ifdef _WIN32
#ifdef _WIN32
std::string path = ReplaceAll(e.s, "\\", "/");
#else
std::string path = e.s;
@@ -998,12 +1000,14 @@ UI::EventReturn MainScreen::OnGameHighlight(UI::EventParams &e) {
highlightedGamePath_ = path;
highlightProgress_ = 0.0f;
}
SetBackgroundAudioGame(highlightedGamePath_);
if (!highlightedGamePath_.empty())
SetBackgroundAudioGame(highlightedGamePath_);
return UI::EVENT_DONE;
}
UI::EventReturn MainScreen::OnGameSelectedInstant(UI::EventParams &e) {
#ifdef _WIN32
#ifdef _WIN32
std::string path = ReplaceAll(e.s, "\\", "/");
#else
std::string path = e.s;