From d96cd0a0136cd2093d59995dfdb45223d70da70f Mon Sep 17 00:00:00 2001
From: FajsiEx <fajsiexofficial@gmail.com>
Date: Mon, 22 Nov 2021 19:57:16 +0100
Subject: [PATCH] * draw footer, header, and scrollbar from filterwheel only if
 in songwheel

---
 scripts/songselect/filterwheel.lua | 11 +++++++----
 scripts/songselect/songwheel.lua   |  2 ++
 scripts/titlescreen.lua            |  2 ++
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/scripts/songselect/filterwheel.lua b/scripts/songselect/filterwheel.lua
index a045b24..01db50c 100644
--- a/scripts/songselect/filterwheel.lua
+++ b/scripts/songselect/filterwheel.lua
@@ -260,6 +260,8 @@ function drawCursor()
 end
 
 function drawScrollbar()
+    if not isFilterWheelActive or transitionLeaveScale ~= 0 then return end
+    
     gfx.BeginPath()
     local bgW = 13*0.85;
     local bgH = 1282*0.85;
@@ -345,10 +347,11 @@ render = function(deltatime, shown)
     
     drawCursor()
     drawScrollbar()
-
-    SongSelectHeader.draw(deltatime);
-    Footer.draw(deltatime);
-
+    
+    if (game.GetSkinSetting('_currentScreen') == 'songwheel') then
+        SongSelectHeader.draw(deltatime);
+        Footer.draw(deltatime);
+    end
 
     if (isFilterWheelActive ~= previousActiveState) then 
         game.PlaySample('filter_wheel/open_close.wav');
diff --git a/scripts/songselect/songwheel.lua b/scripts/songselect/songwheel.lua
index 52c99f8..7c53950 100644
--- a/scripts/songselect/songwheel.lua
+++ b/scripts/songselect/songwheel.lua
@@ -750,6 +750,8 @@ render = function (deltaTime)
     tickTransitions(deltaTime);
     gfx.Scale(scale, scale);
 
+    game.SetSkinSetting('_currentScreen', 'songwheel')
+
     common.stopMusic();
 
     if not difficultyNumbers then
diff --git a/scripts/titlescreen.lua b/scripts/titlescreen.lua
index de5767a..519131d 100644
--- a/scripts/titlescreen.lua
+++ b/scripts/titlescreen.lua
@@ -333,6 +333,8 @@ render = function(deltaTime)
         playedBgm = true;
     end
 
+    game.SetSkinSetting('_currentScreen', 'title')
+
     resetLayoutInformation();
     gfx.Scale(scale, scale);
     gfx.LoadSkinFont("segoeui.ttf")