From 0928498ef2e79e6a1969bb7888b48351ca673bdc Mon Sep 17 00:00:00 2001 From: John Rassa <john@rassaonline.net> Date: Fri, 18 May 2018 21:59:44 -0400 Subject: [PATCH] Fix for Windows build --- es-core/src/components/ImageGridComponent.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/es-core/src/components/ImageGridComponent.h b/es-core/src/components/ImageGridComponent.h index 0e4003759..d43b16e34 100644 --- a/es-core/src/components/ImageGridComponent.h +++ b/es-core/src/components/ImageGridComponent.h @@ -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)