Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2025-02-18 04:45:39 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #614 from jrassa/grid-tile-theme-fix

Browse source 
fix assignment of gridtile theme properties
This commit is contained in:
John Rassa 2019-10-08 19:06:43 -04:00 committed by GitHub
parent 447855fa07 9dfbaa5566
commit c71997f39a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
es-core/src/components/GridTileComponent.cpp
View file

@ -60,36 +60,36 @@ void GridTileComponent::update(int deltaTime)
resize(); resize();
} }
void applyThemeToProperties(const ThemeData::ThemeElement* elem, GridTileProperties properties) void applyThemeToProperties(const ThemeData::ThemeElement* elem, GridTileProperties* properties)
{ {
Vector2f screen = Vector2f((float)Renderer::getScreenWidth(), (float)Renderer::getScreenHeight()); Vector2f screen = Vector2f((float)Renderer::getScreenWidth(), (float)Renderer::getScreenHeight());
if (elem->has("size")) if (elem->has("size"))
properties.mSize = elem->get<Vector2f>("size") * screen; properties->mSize = elem->get<Vector2f>("size") * screen;
if (elem->has("padding")) if (elem->has("padding"))
properties.mPadding = elem->get<Vector2f>("padding"); properties->mPadding = elem->get<Vector2f>("padding");
if (elem->has("imageColor")) if (elem->has("imageColor"))
properties.mImageColor = elem->get<unsigned int>("imageColor"); properties->mImageColor = elem->get<unsigned int>("imageColor");
if (elem->has("backgroundImage")) if (elem->has("backgroundImage"))
properties.mBackgroundImage = elem->get<std::string>("backgroundImage"); properties->mBackgroundImage = elem->get<std::string>("backgroundImage");
if (elem->has("backgroundCornerSize")) if (elem->has("backgroundCornerSize"))
properties.mBackgroundCornerSize = elem->get<Vector2f>("backgroundCornerSize"); properties->mBackgroundCornerSize = elem->get<Vector2f>("backgroundCornerSize");
if (elem->has("backgroundColor")) if (elem->has("backgroundColor"))
{ {
properties.mBackgroundCenterColor = elem->get<unsigned int>("backgroundColor"); properties->mBackgroundCenterColor = elem->get<unsigned int>("backgroundColor");
properties.mBackgroundEdgeColor = elem->get<unsigned int>("backgroundColor"); properties->mBackgroundEdgeColor = elem->get<unsigned int>("backgroundColor");
} }
if (elem->has("backgroundCenterColor")) if (elem->has("backgroundCenterColor"))
properties.mBackgroundCenterColor = elem->get<unsigned int>("backgroundCenterColor"); properties->mBackgroundCenterColor = elem->get<unsigned int>("backgroundCenterColor");
if (elem->has("backgroundEdgeColor")) if (elem->has("backgroundEdgeColor"))
properties.mBackgroundEdgeColor = elem->get<unsigned int>("backgroundEdgeColor"); properties->mBackgroundEdgeColor = elem->get<unsigned int>("backgroundEdgeColor");
} }
void GridTileComponent::applyTheme(const std::shared_ptr<ThemeData>& theme, const std::string& view, const std::string& /*element*/, unsigned int /*properties*/) void GridTileComponent::applyTheme(const std::shared_ptr<ThemeData>& theme, const std::string& view, const std::string& /*element*/, unsigned int /*properties*/)
@ -99,7 +99,7 @@ void GridTileComponent::applyTheme(const std::shared_ptr<ThemeData>& theme, cons
// Apply theme to the default gridtile // Apply theme to the default gridtile
const ThemeData::ThemeElement* elem = theme->getElement(view, "default", "gridtile"); const ThemeData::ThemeElement* elem = theme->getElement(view, "default", "gridtile");
if (elem) if (elem)
applyThemeToProperties(elem, mDefaultProperties); applyThemeToProperties(elem, &mDefaultProperties);
// Apply theme to the selected gridtile // Apply theme to the selected gridtile
// NOTE that some of the default gridtile properties influence on the selected gridtile properties // NOTE that some of the default gridtile properties influence on the selected gridtile properties
@ -112,7 +112,7 @@ void GridTileComponent::applyTheme(const std::shared_ptr<ThemeData>& theme, cons
mSelectedProperties.mBackgroundCornerSize = mDefaultProperties.mBackgroundCornerSize; mSelectedProperties.mBackgroundCornerSize = mDefaultProperties.mBackgroundCornerSize;
if (elem) if (elem)
applyThemeToProperties(elem, mSelectedProperties); applyThemeToProperties(elem, &mSelectedProperties);
} }
// Made this a static function because the ImageGridComponent need to know the default tile size // Made this a static function because the ImageGridComponent need to know the default tile size
@ -320,4 +320,4 @@ void GridTileComponent::forceSize(Vector2f size, float selectedZoom)
{ {
mDefaultProperties.mSize = size; mDefaultProperties.mSize = size;
mSelectedProperties.mSize = size * selectedZoom; mSelectedProperties.mSize = size * selectedZoom;
} }