Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2025-03-06 14:27:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed some compile errors when using old GCC versions.

Browse source
This commit is contained in:
Leon Styhre 2022-04-19 20:00:10 +02:00
parent a28216028e
commit 7872f35d1b
1 changed files with 6 additions and 6 deletions

12
es-core/src/components/primary/CarouselComponent.h
View file

@ -35,8 +35,6 @@ protected:
using List::mWindow; using List::mWindow;
using GuiComponent::mDefaultZIndex; using GuiComponent::mDefaultZIndex;
using GuiComponent::mOrigin;
using GuiComponent::mPosition;
using GuiComponent::mZIndex; using GuiComponent::mZIndex;
public: public:
@ -387,9 +385,11 @@ template <typename T> void CarouselComponent<T>::render(const glm::mat4& parentT
return; return;
glm::mat4 carouselTrans {parentTrans}; glm::mat4 carouselTrans {parentTrans};
carouselTrans = glm::translate(carouselTrans, glm::vec3 {mPosition.x, mPosition.y, 0.0f});
carouselTrans = glm::translate( 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( mRenderer->pushClipRect(
glm::ivec2 {static_cast<int>(glm::clamp(std::round(carouselTrans[3].x), 0.0f, glm::ivec2 {static_cast<int>(glm::clamp(std::round(carouselTrans[3].x), 0.0f,
@ -562,8 +562,8 @@ void CarouselComponent<T>::applyTheme(const std::shared_ptr<ThemeData>& theme,
mSize.x = Renderer::getScreenWidth(); mSize.x = Renderer::getScreenWidth();
mSize.y = Renderer::getScreenHeight() * 0.2325f; mSize.y = Renderer::getScreenHeight() * 0.2325f;
mPosition.x = 0.0f; GuiComponent::mPosition.x = 0.0f;
mPosition.y = floorf(0.5f * (Renderer::getScreenHeight() - mSize.y)); GuiComponent::mPosition.y = floorf(0.5f * (Renderer::getScreenHeight() - mSize.y));
mCarouselColor = 0xFFFFFFD8; mCarouselColor = 0xFFFFFFD8;
mCarouselColorEnd = 0xFFFFFFD8; mCarouselColorEnd = 0xFFFFFFD8;
mZIndex = mDefaultZIndex; mZIndex = mDefaultZIndex;