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

Changed scraper to always display the game name.

Browse source 
Some minor cosmetic changes as well.
This commit is contained in:
Leon Styhre 2020-08-16 16:53:49 +02:00
parent 130d9654f5
commit 7383322bac
1 changed files with 22 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
es-app/src/guis/GuiScraperSearch.cpp
View file

@ -311,18 +311,16 @@ void GuiScraperSearch::onSearchDone(const std::vector<ScraperSearchResult>& resu
} }
else { else {
mFoundGame = true; mFoundGame = true;
if (!(mSearchType == ACCEPT_SINGLE_MATCHES && results.size() == 1)) { ComponentListRow row;
ComponentListRow row;
for (size_t i = 0; i < results.size(); i++) { for (size_t i = 0; i < results.size(); i++) {
row.elements.clear(); row.elements.clear();
row.addElement(std::make_shared<TextComponent>(mWindow, row.addElement(std::make_shared<TextComponent>(mWindow,
Utils::String::toUpper(results.at(i).mdl.get("name")), font, color), true); Utils::String::toUpper(results.at(i).mdl.get("name")), font, color), true);
row.makeAcceptInputHandler([this, i] { returnResult(mScraperResults.at(i)); }); row.makeAcceptInputHandler([this, i] { returnResult(mScraperResults.at(i)); });
mResultList->addRow(row); mResultList->addRow(row);
}
mGrid.resetCursor();
} }
mGrid.resetCursor();
} }
mBlockAccept = false; mBlockAccept = false;
@ -382,7 +380,20 @@ void GuiScraperSearch::updateInfoPane()
if (i != -1 && (int)mScraperResults.size() > i) { if (i != -1 && (int)mScraperResults.size() > i) {
ScraperSearchResult& res = mScraperResults.at(i); ScraperSearchResult& res = mScraperResults.at(i);
mResultName->setText(Utils::String::toUpper(res.mdl.get("name"))); std::string formattedName;
// Hack to make the game name align better with the image when using automatic mode.
mSearchType == ALWAYS_ACCEPT_FIRST_RESULT ?
formattedName = " " + Utils::String::toUpper(res.mdl.get("name")) :
formattedName = Utils::String::toUpper(res.mdl.get("name"));
// If the game name is too long, cut it down. This does not affect the value that
// is actually scraped.
if (formattedName.size() > 40)
formattedName = formattedName.erase(40, formattedName.size()-40) + "...";
mResultName->setText(formattedName);
mResultDesc->setText(Utils::String::toUpper(res.mdl.get("desc"))); mResultDesc->setText(Utils::String::toUpper(res.mdl.get("desc")));
mDescContainer->reset(); mDescContainer->reset();