feature/TASK-4-Search-Bar-Rework #3

Merged
Kuenaimaku merged 3 commits from feature/TASK-4-Search-Bar-Rework into master 2022-03-12 23:48:51 +01:00
2 changed files with 19 additions and 9 deletions
Showing only changes of commit 4cabc5990f - Show all commits

View File

@ -57,6 +57,12 @@
"default": false "default": false
}, },
"gameplay_showSearchControls": {
"label": "Show song select controls when searching",
"type": "bool",
"default": true
},
"separator_f": {}, "separator_f": {},
"Debug": { "type": "label" }, "Debug": { "type": "label" },

View File

@ -35,6 +35,8 @@ local searchInfoPanelImage = gfx.CreateSkinImage("song_select/search_info_panel.
local defaultJacketImage = gfx.CreateSkinImage("song_select/loading.png", 0) local defaultJacketImage = gfx.CreateSkinImage("song_select/loading.png", 0)
local difficultyLabelImages = { local difficultyLabelImages = {
gfx.CreateSkinImage("song_select/plate/difficulty_labels/novice.png", 1), gfx.CreateSkinImage("song_select/plate/difficulty_labels/novice.png", 1),
gfx.CreateSkinImage("song_select/plate/difficulty_labels/advanced.png", 1), gfx.CreateSkinImage("song_select/plate/difficulty_labels/advanced.png", 1),
@ -699,15 +701,17 @@ function drawSearch()
-- Draw search info panel -- Draw search info panel
gfx.BeginPath(); gfx.BeginPath();
local infoResize = 0.855; local infoResize = 0.855;
local sw, sh = gfx.ImageSize(searchInfoPanelImage) local sw, sh = gfx.ImageSize(searchInfoPanelImage)
sw = sw * infoResize; sw = sw * infoResize;
sh = sh * infoResize; sh = sh * infoResize;
local infoXPos = 0; local infoXPos = 0;
local infoYStartPos = desh - sh - 772 + 242; local infoYStartPos = desh - sh - 772 + 242;
local infoYPos = infoYStartPos + transitionSearchInfoOffsetY;
local infoYPos = infoYStartPos + transitionSearchInfoOffsetY; if (game.GetSkinSetting('gameplay_showSearchControls')) then
gfx.ImageRect(infoXPos, infoYPos, sw, sh, searchInfoPanelImage, transitionSearchBackgroundInfoAlpha, 0) gfx.ImageRect(infoXPos, infoYPos, sw, sh, searchInfoPanelImage, transitionSearchBackgroundInfoAlpha, 0)
end
-- Draw Search is Active text -- Draw Search is Active text
gfx.BeginPath(); gfx.BeginPath();