* draw footer, header, and scrollbar from filterwheel only if in songwheel
This commit is contained in:
parent
3c778b875c
commit
d96cd0a013
|
@ -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;
|
||||||
|
@ -345,10 +347,11 @@ render = function(deltatime, shown)
|
||||||
|
|
||||||
drawCursor()
|
drawCursor()
|
||||||
drawScrollbar()
|
drawScrollbar()
|
||||||
|
|
||||||
SongSelectHeader.draw(deltatime);
|
if (game.GetSkinSetting('_currentScreen') == 'songwheel') then
|
||||||
Footer.draw(deltatime);
|
SongSelectHeader.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');
|
||||||
|
|
|
@ -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
|
||||||
|
|
|
@ -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")
|
||||||
|
|
Loading…
Reference in New Issue