Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2024-11-22 22:25:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Enabled the back button for some dialogs

Browse source 
Also made one minor change to the UI mode dialog and changed the width of one dialog when running in Tate mode
This commit is contained in:
Leon Styhre 2023-10-26 22:17:45 +02:00
parent c4f786c079
commit 2055b30836
3 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
es-app/src/guis/GuiMenu.cpp
View file

@ -644,10 +644,12 @@ void GuiMenu::openUIOptions()
msg.append("THIS WILL LIMIT THE AVAILABLE GAMES TO THE ONES\n"); msg.append("THIS WILL LIMIT THE AVAILABLE GAMES TO THE ONES\n");
msg.append("FLAGGED SUITABLE FOR CHILDREN\n"); msg.append("FLAGGED SUITABLE FOR CHILDREN\n");
} }
msg.append("TO UNLOCK AND RETURN TO THE FULL UI, ENTER THIS CODE: \n"); msg.append("TO UNLOCK AND RETURN TO THE FULL UI, ENTER THIS CODE: \n")
msg.append(UIModeController::getInstance()->getFormattedPassKeyStr()); .append(UIModeController::getInstance()->getFormattedPassKeyStr())
.append("\n\n")
.append("DO YOU WANT TO PROCEED?");
mWindow->pushGui(new GuiMsgBox( mWindow->pushGui(new GuiMsgBox(
this->getHelpStyle(), msg, "PROCEED", this->getHelpStyle(), msg, "YES",
[this, selectedMode] { [this, selectedMode] {
LOG(LogDebug) << "GuiMenu::openUISettings(): Setting UI mode to '" LOG(LogDebug) << "GuiMenu::openUISettings(): Setting UI mode to '"
<< selectedMode << "'."; << selectedMode << "'.";
@ -674,7 +676,7 @@ void GuiMenu::openUIOptions()
false); false);
mWindow->invalidateCachedBackground(); mWindow->invalidateCachedBackground();
}, },
"CANCEL", nullptr, "", nullptr, nullptr, true)); "NO", nullptr, "", nullptr, nullptr, true));
} }
else { else {
LOG(LogDebug) << "GuiMenu::openUISettings(): Setting UI mode to '" << selectedMode LOG(LogDebug) << "GuiMenu::openUISettings(): Setting UI mode to '" << selectedMode
@ -1749,7 +1751,7 @@ void GuiMenu::openUtilities()
}, },
"CANCEL", nullptr, "", nullptr, nullptr, false, true, "CANCEL", nullptr, "", nullptr, nullptr, false, true,
(mRenderer->getIsVerticalOrientation() ? (mRenderer->getIsVerticalOrientation() ?
0.80f : 0.76f :
0.52f * (1.778f / mRenderer->getScreenAspectRatio())))); 0.52f * (1.778f / mRenderer->getScreenAspectRatio()))));
}); });
s->addRow(row); s->addRow(row);

10
es-app/src/guis/GuiThemeDownloader.cpp
View file

@ -724,7 +724,7 @@ void GuiThemeDownloader::populateGUI()
mStatusType = StatusType::STATUS_DOWNLOADING; mStatusType = StatusType::STATUS_DOWNLOADING;
mStatusText = "DOWNLOADING THEME"; mStatusText = "DOWNLOADING THEME";
}, },
"CANCEL", [] { return; }, "", nullptr, nullptr, true, true, "CANCEL", [] { return; }, "", nullptr, nullptr, false, true,
(mRenderer->getIsVerticalOrientation() ? (mRenderer->getIsVerticalOrientation() ?
0.75f : 0.75f :
0.46f * (1.778f / mRenderer->getScreenAspectRatio())))); 0.46f * (1.778f / mRenderer->getScreenAspectRatio()))));
@ -752,7 +752,7 @@ void GuiThemeDownloader::populateGUI()
mStatusType = StatusType::STATUS_DOWNLOADING; mStatusType = StatusType::STATUS_DOWNLOADING;
mStatusText = "DOWNLOADING THEME"; mStatusText = "DOWNLOADING THEME";
}, },
"CANCEL", [] { return; }, "", nullptr, nullptr, true, true, "CANCEL", [] { return; }, "", nullptr, nullptr, false, true,
(mRenderer->getIsVerticalOrientation() ? (mRenderer->getIsVerticalOrientation() ?
0.75f : 0.75f :
0.46f * (1.778f / mRenderer->getScreenAspectRatio())))); 0.46f * (1.778f / mRenderer->getScreenAspectRatio()))));
@ -779,7 +779,7 @@ void GuiThemeDownloader::populateGUI()
mStatusType = StatusType::STATUS_DOWNLOADING; mStatusType = StatusType::STATUS_DOWNLOADING;
mStatusText = "DOWNLOADING THEME"; mStatusText = "DOWNLOADING THEME";
}, },
"CANCEL", [] { return; }, "", nullptr, nullptr, true, true, "CANCEL", [] { return; }, "", nullptr, nullptr, false, true,
(mRenderer->getIsVerticalOrientation() ? (mRenderer->getIsVerticalOrientation() ?
0.75f : 0.75f :
0.46f * (1.778f / mRenderer->getScreenAspectRatio())))); 0.46f * (1.778f / mRenderer->getScreenAspectRatio()))));
@ -799,7 +799,7 @@ void GuiThemeDownloader::populateGUI()
mStatusType = StatusType::STATUS_UPDATING; mStatusType = StatusType::STATUS_UPDATING;
mStatusText = "UPDATING THEME"; mStatusText = "UPDATING THEME";
}, },
"CANCEL", [] { return; }, "", nullptr, nullptr, true, true, "CANCEL", [] { return; }, "", nullptr, nullptr, false, true,
(mRenderer->getIsVerticalOrientation() ? (mRenderer->getIsVerticalOrientation() ?
0.75f : 0.75f :
0.45f * (1.778f / mRenderer->getScreenAspectRatio())))); 0.45f * (1.778f / mRenderer->getScreenAspectRatio()))));
@ -1173,7 +1173,7 @@ bool GuiThemeDownloader::input(InputConfig* config, Input input)
makeInventory(); makeInventory();
updateGUI(); updateGUI();
}, },
"CANCEL", nullptr, "", nullptr, nullptr, true, true, "CANCEL", nullptr, "", nullptr, nullptr, false, true,
(mRenderer->getIsVerticalOrientation() ? (mRenderer->getIsVerticalOrientation() ?
0.70f : 0.70f :
0.44f * (1.778f / mRenderer->getScreenAspectRatio())))); 0.44f * (1.778f / mRenderer->getScreenAspectRatio()))));

2
es-app/src/views/ViewController.cpp
View file

@ -279,7 +279,7 @@ void ViewController::noGamesDialog()
nullptr, true)); nullptr, true));
} }
}, },
"CANCEL", nullptr, "", nullptr, nullptr, true)); "CANCEL", nullptr, "", nullptr, nullptr, false));
}, },
"QUIT", "QUIT",
[] { [] {