diff --git a/scripts/songselect/filterwheel.lua b/scripts/songselect/filterwheel.lua index e9c22ee..daa25dd 100644 --- a/scripts/songselect/filterwheel.lua +++ b/scripts/songselect/filterwheel.lua @@ -124,8 +124,18 @@ end function getFolderData(folderLabel) local folderType = 'unknown'; local isSpecial = false; - local folderBgImage = defaultFolderBgImage; + + if not folderLabel then + return { + type = folderType, + label = 'UNKNOWN', + bgImage = folderBgImage, + isSpecial = isSpecial + } + end + + if selectionMode == 'levels' then folderBgImage = subFolderBgImage end @@ -285,6 +295,9 @@ render = function(deltatime, shown) game.SetSkinSetting('_songWheelOverlayActive', 1); drawFilterWheel(deltatime) end + + game.SetSkinSetting('_songWheelActiveFolderLabel', getFolderData(filters.folder[selectedFolder]).label); + game.SetSkinSetting('_songWheelActiveSubFolderLabel', getFolderData(filters.level[selectedLevel]).label); SongSelectHeader.draw(deltatime); Footer.draw({noEnterTransition = true}); diff --git a/scripts/songselect/songwheel.lua b/scripts/songselect/songwheel.lua index 25b8028..9ff64c1 100644 --- a/scripts/songselect/songwheel.lua +++ b/scripts/songselect/songwheel.lua @@ -22,6 +22,8 @@ local cursorImages = { local diffCursorImage = gfx.CreateSkinImage("song_select/level_cursor.png", 1) +local filterInfoBgImage = gfx.CreateSkinImage("song_select/filter_info_bg.png", 1) + local searchBgImage = gfx.CreateSkinImage("song_select/search_bg.png", 1) local headerTitleImage = gfx.CreateSkinImage("song_select/header/title.png", 1) @@ -440,6 +442,23 @@ function drawData() -- Draws the song data on the left panel gfx.GlobalAlpha(1); end +function drawFilterInfo(deltatime) + gfx.BeginPath() + gfx.ImageRect(5, 95, 417*0.85, 163*0.85, filterInfoBgImage, 1, 0) + + local folderLabel = game.GetSkinSetting('_songWheelActiveFolderLabel') + local subFolderLabel = game.GetSkinSetting('_songWheelActiveSubFolderLabel') + + gfx.FontSize(24) + gfx.TextAlign(gfx.TEXT_ALIGN_CENTER + gfx.TEXT_ALIGN_MIDDLE) + + gfx.BeginPath() + gfx.Text(folderLabel, 167, 131); + + gfx.BeginPath() + gfx.Text(subFolderLabel, 195, 166); +end + function drawSearch() if (not songwheel.searchInputActive) then return; @@ -565,6 +584,8 @@ render = function (deltaTime) drawData() + drawFilterInfo(deltaTime) + drawSearch(); if (game.GetSkinSetting('_songWheelOverlayActive') ~= 1) then diff --git a/textures/song_select/folder indicators.png b/textures/song_select/filter_info_bg.png similarity index 100% rename from textures/song_select/folder indicators.png rename to textures/song_select/filter_info_bg.png