Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2025-01-29 19:55:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Removed some unnecessary parantheses introduced by the last commit.

Browse source
This commit is contained in:
Leon Styhre 2023-02-19 19:27:58 +01:00
parent 340765892f
commit 1fbd34813e
2 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
es-app/src/views/GamelistView.cpp
View file

@ -204,7 +204,7 @@ void GamelistView::onThemeChanged(const std::shared_ptr<ThemeData>& theme)
addChild(mPrimary);
}
if (element.second.type == "image" &&
(!(element.second.has("visible") && !element.second.get<bool>("visible")))) {
!(element.second.has("visible") && !element.second.get<bool>("visible"))) {
// If this is the startup system, then forceload the images to avoid texture pop-in.
if (isStartupSystem)
mImageComponents.push_back(std::make_unique<ImageComponent>(true));
@ -219,7 +219,7 @@ void GamelistView::onThemeChanged(const std::shared_ptr<ThemeData>& theme)
addChild(mImageComponents.back().get());
}
else if (element.second.type == "video" &&
(!(element.second.has("visible") && !element.second.get<bool>("visible")))) {
!(element.second.has("visible") && !element.second.get<bool>("visible"))) {
if (element.second.has("path")) {
mStaticVideoComponents.push_back(std::make_unique<VideoFFmpegComponent>());
mStaticVideoComponents.back()->setDefaultZIndex(30.0f);
@ -242,7 +242,7 @@ void GamelistView::onThemeChanged(const std::shared_ptr<ThemeData>& theme)
}
}
else if (element.second.type == "animation" && element.second.has("path") &&
(!(element.second.has("visible") && !element.second.get<bool>("visible")))) {
!(element.second.has("visible") && !element.second.get<bool>("visible"))) {
const std::string extension {
Utils::FileSystem::getExtension(element.second.get<std::string>("path"))};
if (extension == ".json") {
@ -274,7 +274,7 @@ void GamelistView::onThemeChanged(const std::shared_ptr<ThemeData>& theme)
}
}
else if (element.second.type == "badges" &&
(!(element.second.has("visible") && !element.second.get<bool>("visible")))) {
!(element.second.has("visible") && !element.second.get<bool>("visible"))) {
mBadgeComponents.push_back(std::make_unique<BadgeComponent>());
mBadgeComponents.back()->setDefaultZIndex(35.0f);
mBadgeComponents.back()->applyTheme(theme, "gamelist", element.first, ALL);
@ -282,7 +282,7 @@ void GamelistView::onThemeChanged(const std::shared_ptr<ThemeData>& theme)
addChild(mBadgeComponents.back().get());
}
else if (element.second.type == "text" &&
(!(element.second.has("visible") && !element.second.get<bool>("visible")))) {
!(element.second.has("visible") && !element.second.get<bool>("visible"))) {
// Set as container by default if metadata type is "description".
bool container {false};
if (element.second.has("container")) {
@ -328,7 +328,7 @@ void GamelistView::onThemeChanged(const std::shared_ptr<ThemeData>& theme)
}
}
else if (element.second.type == "datetime" &&
(!(element.second.has("visible") && !element.second.get<bool>("visible")))) {
!(element.second.has("visible") && !element.second.get<bool>("visible"))) {
mDateTimeComponents.push_back(std::make_unique<DateTimeComponent>());
mDateTimeComponents.back()->setDefaultZIndex(40.0f);
mDateTimeComponents.back()->applyTheme(theme, "gamelist", element.first, ALL);
@ -337,14 +337,14 @@ void GamelistView::onThemeChanged(const std::shared_ptr<ThemeData>& theme)
addChild(mDateTimeComponents.back().get());
}
else if (element.second.type == "gamelistinfo" &&
(!(element.second.has("visible") && !element.second.get<bool>("visible")))) {
!(element.second.has("visible") && !element.second.get<bool>("visible"))) {
mGamelistInfoComponents.push_back(std::make_unique<TextComponent>());
mGamelistInfoComponents.back()->setDefaultZIndex(45.0f);
mGamelistInfoComponents.back()->applyTheme(theme, "gamelist", element.first, ALL);
addChild(mGamelistInfoComponents.back().get());
}
else if (element.second.type == "rating" &&
(!(element.second.has("visible") && !element.second.get<bool>("visible")))) {
!(element.second.has("visible") && !element.second.get<bool>("visible"))) {
mRatingComponents.push_back(std::make_unique<RatingComponent>());
mRatingComponents.back()->setDefaultZIndex(45.0f);
mRatingComponents.back()->applyTheme(theme, "gamelist", element.first, ALL);

24
es-app/src/views/SystemView.cpp
View file

@ -584,8 +584,8 @@ void SystemView::populate()
}
}
else if (element.second.type == "image" &&
(!(element.second.has("visible") &&
!element.second.get<bool>("visible")))) {
!(element.second.has("visible") &&
!element.second.get<bool>("visible"))) {
// If this is the first system then forceload to avoid texture pop-in.
if (it == SystemData::sSystemVector.front())
elements.imageComponents.emplace_back(
@ -600,8 +600,8 @@ void SystemView::populate()
elements.children.emplace_back(elements.imageComponents.back().get());
}
else if (element.second.type == "video" &&
(!(element.second.has("visible") &&
!element.second.get<bool>("visible")))) {
!(element.second.has("visible") &&
!element.second.get<bool>("visible"))) {
elements.videoComponents.emplace_back(
std::make_unique<VideoFFmpegComponent>());
elements.videoComponents.back()->setDefaultZIndex(30.0f);
@ -611,8 +611,8 @@ void SystemView::populate()
elements.children.emplace_back(elements.videoComponents.back().get());
}
else if (element.second.type == "animation" && element.second.has("path") &&
(!(element.second.has("visible") &&
!element.second.get<bool>("visible")))) {
!(element.second.has("visible") &&
!element.second.get<bool>("visible"))) {
const std::string extension {Utils::FileSystem::getExtension(
element.second.get<std::string>("path"))};
if (extension == ".json") {
@ -645,8 +645,8 @@ void SystemView::populate()
}
}
else if (element.second.type == "text" &&
(!(element.second.has("visible") &&
!element.second.get<bool>("visible")))) {
!(element.second.has("visible") &&
!element.second.get<bool>("visible"))) {
if (element.second.has("systemdata") &&
element.second.get<std::string>("systemdata").substr(0, 9) ==
"gamecount") {
@ -669,8 +669,8 @@ void SystemView::populate()
}
}
else if (element.second.type == "datetime" &&
(!(element.second.has("visible") &&
!element.second.get<bool>("visible")))) {
!(element.second.has("visible") &&
!element.second.get<bool>("visible"))) {
elements.dateTimeComponents.emplace_back(
std::make_unique<DateTimeComponent>());
elements.dateTimeComponents.back()->setDefaultZIndex(40.0f);
@ -680,8 +680,8 @@ void SystemView::populate()
elements.children.emplace_back(elements.dateTimeComponents.back().get());
}
else if (element.second.type == "rating" &&
(!(element.second.has("visible") &&
!element.second.get<bool>("visible")))) {
!(element.second.has("visible") &&
!element.second.get<bool>("visible"))) {
elements.ratingComponents.emplace_back(std::make_unique<RatingComponent>());
elements.ratingComponents.back()->setDefaultZIndex(45.0f);
elements.ratingComponents.back()->applyTheme(theme, "system", element.first,