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

Set the clang-format option SpaceBeforeCpp11BracedList to true.

Browse source
This commit is contained in:
Leon Styhre 2022-01-16 12:09:55 +01:00
parent e64976d4bc
commit 8a6652552f
84 changed files with 1161 additions and 1160 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.clang-format
View file

@ -119,7 +119,7 @@ SpaceAfterCStyleCast: false
SpaceAfterLogicalNot: false
SpaceAfterTemplateKeyword: true
SpaceBeforeAssignmentOperators: true
SpaceBeforeCpp11BracedList: false
SpaceBeforeCpp11BracedList: true
SpaceBeforeCtorInitializerColon: true
SpaceBeforeInheritanceColon: true
SpaceBeforeParens: ControlStatements

5
es-core/src/ThemeData.cpp
View file

@ -26,8 +26,9 @@ std::vector<std::string> ThemeData::sSupportedViews{{"all"}, {"system"}, {"
std::vector<std::string> ThemeData::sSupportedFeatures {
{"navigationsounds"}, {"video"}, {"carousel"}, {"z-index"}, {"visible"}};
std::map<std::string, std::map<std::string, ThemeData::ElementPropertyType>> ThemeData::sElementMap{
{"image",
std::map<std::string, std::map<std::string, ThemeData::ElementPropertyType>>
ThemeData::sElementMap // Line break.
{{"image",
{{"pos", NORMALIZED_PAIR},
{"size", NORMALIZED_PAIR},
{"maxSize", NORMALIZED_PAIR},

4
es-core/src/components/ImageGridComponent.h
View file

@ -278,8 +278,8 @@ void ImageGridComponent<T>::applyTheme(const std::shared_ptr<ThemeData>& theme,
mMargin = elem->get<glm::vec2>("margin") * screen;
if (elem->has("padding"))
mPadding =
elem->get<glm::vec4>("padding") * glm::vec4{screen.x, screen.y, screen.x, screen.y};
mPadding = elem->get<glm::vec4>("padding") *
glm::vec4 {screen.x, screen.y, screen.x, screen.y};
if (elem->has("autoLayout"))
mAutoLayout = elem->get<glm::vec2>("autoLayout");