* draw footer, header, and scrollbar from filterwheel only if in songwheel

This commit is contained in:
FajsiEx 2021-11-22 19:57:16 +01:00
parent 3c778b875c
commit d96cd0a013
3 changed files with 11 additions and 4 deletions

View File

@ -260,6 +260,8 @@ function drawCursor()
end end
function drawScrollbar() function drawScrollbar()
if not isFilterWheelActive or transitionLeaveScale ~= 0 then return end
gfx.BeginPath() gfx.BeginPath()
local bgW = 13*0.85; local bgW = 13*0.85;
local bgH = 1282*0.85; local bgH = 1282*0.85;
@ -346,9 +348,10 @@ render = function(deltatime, shown)
drawCursor() drawCursor()
drawScrollbar() drawScrollbar()
if (game.GetSkinSetting('_currentScreen') == 'songwheel') then
SongSelectHeader.draw(deltatime); SongSelectHeader.draw(deltatime);
Footer.draw(deltatime); Footer.draw(deltatime);
end
if (isFilterWheelActive ~= previousActiveState) then if (isFilterWheelActive ~= previousActiveState) then
game.PlaySample('filter_wheel/open_close.wav'); game.PlaySample('filter_wheel/open_close.wav');

View File

@ -750,6 +750,8 @@ render = function (deltaTime)
tickTransitions(deltaTime); tickTransitions(deltaTime);
gfx.Scale(scale, scale); gfx.Scale(scale, scale);
game.SetSkinSetting('_currentScreen', 'songwheel')
common.stopMusic(); common.stopMusic();
if not difficultyNumbers then if not difficultyNumbers then

View File

@ -333,6 +333,8 @@ render = function(deltaTime)
playedBgm = true; playedBgm = true;
end end
game.SetSkinSetting('_currentScreen', 'title')
resetLayoutInformation(); resetLayoutInformation();
gfx.Scale(scale, scale); gfx.Scale(scale, scale);
gfx.LoadSkinFont("segoeui.ttf") gfx.LoadSkinFont("segoeui.ttf")