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

RE: #14 (cherry picked from commit 305fd7c) # Conflicts: # BGAnimations/ScreenSelectMusic overlay/PaneDisplay.lua # BGAnimations/ScreenSelectMusic overlay/PerPlayer/Cursor-ITG.lua # BGAnimations/ScreenSelectMusic overlay/PerPlayer/StepArtist-ITG.lua # BGAnimations/ScreenSelectMusic overlay/SongDescription/SongDescription.lua # BGAnimations/ScreenSelectMusic overlay/StepsDisplayList/Grid-ITG.lua # BGAnimations/ScreenSelectMusic overlay/banner.lua
CrashCringle12 · Dec 28, 2022 · 02b1634 · 02b1634
1 parent 4912a0c
commit 02b1634
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 13 deletions.
diff --git a/BGAnimations/ScreenSelectMusic overlay/PaneDisplay.lua b/BGAnimations/ScreenSelectMusic overlay/PaneDisplay.lua
@@ -189,13 +189,19 @@ end
 
 -- -----------------------------------------------------------------------
 -- define the x positions of four columns, and the y positions of three rows of PaneItems
-local pos = {
-	col = { WideScale(-104,-133), WideScale(-36,-38), WideScale(54,76), WideScale(150, 190) },
-	row = { 13, 31, 49 }
-}
+local pos = {}
+pos.row = { 13, 31, 49 }
+
+if IsUsingWideScreen() then
+	-- five columns
+	pos.col = { WideScale(-110,-155), WideScale(-60, -82), WideScale(-5, -5), WideScale(130,135), IsServiceAllowed(SL.GrooveStats.GetScores) and WideScale(200,230) or WideScale(150,200)}
+else
+	-- four columns
+	pos.col = { WideScale(-104,-133), WideScale(-36,-38), WideScale(100,85), IsServiceAllowed(SL.GrooveStats.GetScores) and WideScale(190, 220) or WideScale(150, 190)   }
+end
+
 
-local num_rows = 3
-local num_cols = 2
+local num_cols = IsUsingWideScreen() and 4 or 3
 
 -- HighScores handled as special cases for now until further refactoring
 local PaneItems = {

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 - 55)
+		self:xy(_screen.cx - (IsUsingWideScreen() and 170 or 160), _screen.cy - 55)
 	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/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, 96)
 		else
-			self:zoom(0.75)
-			self:xy(_screen.cx - 166, 96)
+			self:zoom(0.72)
+			self:xy(_screen.cx - 160, 96)
 		end
 	end
 }
@@ -68,4 +68,4 @@ t[#t+1] = Def.ActorFrame{
 	}
 }
 
-return t
+return t
diff --git a/Scripts/SL-Helpers-GrooveStats.lua b/Scripts/SL-Helpers-GrooveStats.lua
@@ -136,7 +136,7 @@ RequestResponseActor = function(name, timeout, 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)