Tidied up ScreenSelectMusic for 4:3 (at least in ITG mode)

RE: CrashCringle12#14
Simply-Love · Dec 23, 2022 · 305fd7c · 305fd7c
1 parent d5022ea
commit 305fd7c
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 15 deletions.
diff --git a/BGAnimations/ScreenSelectMusic overlay/PaneDisplay.lua b/BGAnimations/ScreenSelectMusic overlay/PaneDisplay.lua
@@ -245,7 +245,7 @@ end
 -- -----------------------------------------------------------------------
 local af = Def.ActorFrame{ Name="PaneDisplayMaster" }
 
-af[#af+1] = RequestResponseActor(17, 50)..{
+af[#af+1] = RequestResponseActor(17, IsUsingWideScreen() and 50 or 42)..{
 	Name="GetScoresRequester",
 	OnCommand=function(self)
 		-- Create variables for both players, even if they're not currently active.
@@ -339,7 +339,7 @@ for player in ivalues(PlayerNumber) do
 		self:visible(GAMESTATE:IsHumanPlayer(player))
 
 		if player == PLAYER_1 then
-			self:x(_screen.w * 0.25 - 5)
+			self:x( _screen.w * 0.25 - 5)
 		elseif player == PLAYER_2 then
 			self:x(_screen.w * 0.75 + 5)
 		end

diff --git a/BGAnimations/ScreenSelectMusic overlay/PerPlayer/Cursor-ITG.lua b/BGAnimations/ScreenSelectMusic overlay/PerPlayer/Cursor-ITG.lua
@@ -41,12 +41,12 @@ return Def.Sprite{
 		self:bounce():effectclock("beatnooffset")
 
 		if player == PLAYER_1 then
-			self:x( IsUsingWideScreen() and _screen.cx-330 or 0)
+			self:x( IsUsingWideScreen() and _screen.cx-330 or 15)
 			self:effectmagnitude(-3,0,0)
 
 		elseif player == PLAYER_2 then
 			self:rotationz(180)
-			self:x(IsUsingWideScreen() and _screen.cx-28 or 276)
+			self:x(IsUsingWideScreen() and _screen.cx-28 or 288)
 			self:effectmagnitude(3,0,0)
 		end
 

diff --git a/BGAnimations/ScreenSelectMusic overlay/PerPlayer/StepArtist-ITG.lua b/BGAnimations/ScreenSelectMusic overlay/PerPlayer/StepArtist-ITG.lua
@@ -37,12 +37,12 @@ return Def.ActorFrame{
 		if player == PLAYER_1 then
 
 			self:y(_screen.cy + 44)
-			self:x( _screen.cx - (IsUsingWideScreen() and 356 or 346))
+			self:x( _screen.cx - (IsUsingWideScreen() and 356 or 336))
 
 		elseif player == PLAYER_2 then
 
 			self:y(_screen.cy + 97)
-			self:x( _screen.cx - 210)
+			self:x( _screen.cx - (IsUsingWideScreen() and 210 or 210))
 		end
 
 		if GAMESTATE:IsHumanPlayer(player) then

diff --git a/BGAnimations/ScreenSelectMusic overlay/SongDescription/SongDescription.lua b/BGAnimations/ScreenSelectMusic overlay/SongDescription/SongDescription.lua
@@ -2,11 +2,11 @@ local MusicWheel, SelectedType
 local group_durations = LoadActor("./GroupDurations.lua")
 
 -- width of background quad
-local _w = IsUsingWideScreen() and 320 or 310
+local _w = IsUsingWideScreen() and 320 or 303
 
 local af = Def.ActorFrame{
 	OnCommand=function(self)
-		self:xy(_screen.cx - (IsUsingWideScreen() and 170 or 165), _screen.cy - (SL.Global.GameMode == "FA+" and 55 or 28))
+		self:xy(_screen.cx - (IsUsingWideScreen() and 170 or 160), _screen.cy - (SL.Global.GameMode == "FA+" and 55 or 28))
 	end,
 
 	CurrentSongChangedMessageCommand=function(self)    self:playcommand("Set") end,
@@ -29,7 +29,7 @@ af[#af+1] = Def.Quad{
 
 -- ActorFrame for Artist, BPM, and Song length
 af[#af+1] = Def.ActorFrame{
-	InitCommand=function(self) self:xy(-110,-6) end,
+	InitCommand=function(self) self:xy(IsUsingWideScreen() and -110 or -95,-6) end,
 
 	-- ----------------------------------------
 	-- Artist Label

diff --git a/BGAnimations/ScreenSelectMusic overlay/StepsDisplayList/Grid-ITG.lua b/BGAnimations/ScreenSelectMusic overlay/StepsDisplayList/Grid-ITG.lua
@@ -7,13 +7,13 @@ local num_rows    = 5
 local num_columns = 20
 
 local GridZoomX = IsUsingWideScreen() and 0.435 or 0.39
-local BlockZoomY = 0.275
+local BlockZoomY = IsUsingWideScreen() and 0.275 or 0.27
 
 local GetStepsToDisplay = LoadActor("./StepsToDisplay.lua")
 
 local t = Def.ActorFrame{
 	Name="StepsDisplayList",
-	InitCommand=function(self) self:vertalign(top):xy(_screen.cx-170, _screen.cy + 70) end,
+	InitCommand=function(self) self:vertalign(top):xy(IsUsingWideScreen() and _screen.cx-170 or _screen.cx-160 , _screen.cy + 70) end,
 
 	OnCommand=function(self)                           self:queuecommand("RedrawStepsDisplay") end,
 	CurrentSongChangedMessageCommand=function(self)    self:queuecommand("RedrawStepsDisplay") end,
@@ -56,7 +56,11 @@ local t = Def.ActorFrame{
 	Def.Quad{
 		Name="Background",
 		InitCommand=function(self)
-			self:diffuse(color("#1e282f")):zoomto(320, 96)
+			if IsUsingWideScreen() then
+				self:diffuse(color("#1e282f")):zoomto(320, 96)
+			else
+				self:diffuse(color("#1e282f")):zoomto(300, 94)
+			end
 			if ThemePrefs.Get("RainbowMode") then
 				self:diffusealpha(0.9)
 			end

diff --git a/BGAnimations/ScreenSelectMusic overlay/banner.lua b/BGAnimations/ScreenSelectMusic overlay/banner.lua
@@ -9,8 +9,8 @@ local t = Def.ActorFrame{
 			self:zoom(0.7655)
 			self:xy(_screen.cx - 170, SL.Global.GameMode == "FA+" and 96 or 112)
 		else
-			self:zoom(0.75)
-			self:xy(_screen.cx - 166, SL.Global.GameMode == "FA+" and 96 or 112)
+			self:zoom(0.72)
+			self:xy(_screen.cx - 160, SL.Global.GameMode == "FA+" and 96 or 112)
 		end
 	end
 }

diff --git a/Scripts/SL-Helpers-GrooveStats.lua b/Scripts/SL-Helpers-GrooveStats.lua
@@ -153,7 +153,7 @@ RequestResponseActor = function(x, y)
 				Texture=THEME:GetPathG("", "LoadingSpinner 10x3.png"),
 				Frames=Sprite.LinearFrames(30,1),
 				InitCommand=function(self)
-					self:zoom(0.15)
+					self:zoom(IsUsingWideScreen() and 0.15 or 0.08)
 					self:diffuse(GetHexColor(SL.Global.ActiveColorIndex, true))
 				end,
 				VisualStyleSelectedMessageCommand=function(self)