From 957c1fa7fced986c821bd7ab9a9ec639a3bc8457 Mon Sep 17 00:00:00 2001
From: shadash <sophiahadash@gmail.com>
Date: Fri, 15 Oct 2021 22:54:04 +0200
Subject: [PATCH] render extras with z-index higher than the carousel above the
 carousel

Signed-off-by: Sophia Hadash <sophiahadash@gmail.com>
---
 es-app/src/views/SystemView.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/es-app/src/views/SystemView.cpp b/es-app/src/views/SystemView.cpp
index 8159bacbd..c186960dd 100644
--- a/es-app/src/views/SystemView.cpp
+++ b/es-app/src/views/SystemView.cpp
@@ -402,7 +402,8 @@ void SystemView::render(const glm::mat4& parentTrans)
 
     glm::mat4 trans{getTransform() * parentTrans};
 
-    renderExtras(trans, INT16_MIN, INT16_MAX);
+    // Render the extras that are below the carousel.
+    renderExtras(trans, INT16_MIN, mCarousel.zIndex);
 
     // Fade the screen if we're using fade transitions and we're currently transitioning.
     // This basically renders a black rectangle on top of the currently visible extras
@@ -412,6 +413,9 @@ void SystemView::render(const glm::mat4& parentTrans)
 
     // Always render the carousel on top so that it's not faded.
     renderCarousel(trans);
+
+    // Render the rest of the extras.
+    renderExtras(trans, mCarousel.zIndex, INT16_MAX);
 }
 
 std::vector<HelpPrompt> SystemView::getHelpPrompts()