Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2025-01-31 04:25:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix for Windows build

Browse source
This commit is contained in:
John Rassa 2018-05-18 21:59:44 -04:00
parent d85f3b8a42
commit 0928498ef2
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -204,10 +204,8 @@ void ImageGridComponent<T>::render(const Transform4x4f& parentTrans)
template<typename T>
void ImageGridComponent<T>::applyTheme(const std::shared_ptr<ThemeData>& theme, const std::string& view, const std::string& element, unsigned int properties)
{
using namespace ThemeFlags;
// Apply theme to GuiComponent but not size property, which will be applied at the end of this function
GuiComponent::applyTheme(theme, view, element, properties ^ SIZE);
GuiComponent::applyTheme(theme, view, element, properties ^ ThemeFlags::SIZE);
// Keep the theme pointer to apply it on the tiles later on
mTheme = theme;
@ -277,7 +275,7 @@ void ImageGridComponent<T>::applyTheme(const std::shared_ptr<ThemeData>& theme,
GridTileComponent::getDefaultTileSize();
// Apply size property, will trigger a call to onSizeChanged() which will build the tiles
GuiComponent::applyTheme(theme, view, element, SIZE);
GuiComponent::applyTheme(theme, view, element, ThemeFlags::SIZE);
// Trigger the call manually if the theme have no "imagegrid" element
if (!elem)