From 7872f35d1b8641a23e1fda0b1c81a8f770c00bdd Mon Sep 17 00:00:00 2001 From: Leon Styhre Date: Tue, 19 Apr 2022 20:00:10 +0200 Subject: [PATCH] Fixed some compile errors when using old GCC versions. --- es-core/src/components/primary/CarouselComponent.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/es-core/src/components/primary/CarouselComponent.h b/es-core/src/components/primary/CarouselComponent.h index 20742fd7c..0852010f9 100644 --- a/es-core/src/components/primary/CarouselComponent.h +++ b/es-core/src/components/primary/CarouselComponent.h @@ -35,8 +35,6 @@ protected: using List::mWindow; using GuiComponent::mDefaultZIndex; - using GuiComponent::mOrigin; - using GuiComponent::mPosition; using GuiComponent::mZIndex; public: @@ -387,9 +385,11 @@ template void CarouselComponent::render(const glm::mat4& parentT return; glm::mat4 carouselTrans {parentTrans}; - carouselTrans = glm::translate(carouselTrans, glm::vec3 {mPosition.x, mPosition.y, 0.0f}); carouselTrans = glm::translate( - carouselTrans, glm::vec3 {mOrigin.x * mSize.x * -1.0f, mOrigin.y * mSize.y * -1.0f, 0.0f}); + carouselTrans, glm::vec3 {GuiComponent::mPosition.x, GuiComponent::mPosition.y, 0.0f}); + carouselTrans = + glm::translate(carouselTrans, glm::vec3 {GuiComponent::mOrigin.x * mSize.x * -1.0f, + GuiComponent::mOrigin.y * mSize.y * -1.0f, 0.0f}); mRenderer->pushClipRect( glm::ivec2 {static_cast(glm::clamp(std::round(carouselTrans[3].x), 0.0f, @@ -562,8 +562,8 @@ void CarouselComponent::applyTheme(const std::shared_ptr& theme, mSize.x = Renderer::getScreenWidth(); mSize.y = Renderer::getScreenHeight() * 0.2325f; - mPosition.x = 0.0f; - mPosition.y = floorf(0.5f * (Renderer::getScreenHeight() - mSize.y)); + GuiComponent::mPosition.x = 0.0f; + GuiComponent::mPosition.y = floorf(0.5f * (Renderer::getScreenHeight() - mSize.y)); mCarouselColor = 0xFFFFFFD8; mCarouselColorEnd = 0xFFFFFFD8; mZIndex = mDefaultZIndex;