From cd7bfd487c8fb97dd3179d712727133bb6eb3caf Mon Sep 17 00:00:00 2001
From: Crash Cringle <30600688+CrashCringle12@users.noreply.github.com>
Date: Fri, 23 Dec 2022 10:40:27 -0500
Subject: [PATCH] Tidyings for 4:3 while ChartParsing information is showing
 RE: https://github.com/CrashCringle12/Simply-Love-SM5/issues/14

(cherry picked from commit ee3aa66299ac1ce0d957f4960f200202e1135d9d)

# Conflicts:
#	BGAnimations/ScreenSelectMusic overlay/PerPlayer/DensityGraph.lua
#	BGAnimations/ScreenSelectMusic overlay/PerPlayer/StepArtist-Classic.lua
---
 .../PerPlayer/DensityGraph.lua                   | 16 ++++++++++------
 .../PerPlayer/StepArtist.lua                     |  6 +++---
 .../StepsDisplayList/Grid.lua                    |  2 +-
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/BGAnimations/ScreenSelectMusic overlay/PerPlayer/DensityGraph.lua b/BGAnimations/ScreenSelectMusic overlay/PerPlayer/DensityGraph.lua
index 92a62671c..a56560f68 100644
--- a/BGAnimations/ScreenSelectMusic overlay/PerPlayer/DensityGraph.lua	
+++ b/BGAnimations/ScreenSelectMusic overlay/PerPlayer/DensityGraph.lua	
@@ -5,14 +5,15 @@ if GAMESTATE:IsCourseMode() then return end
 local player = ...
 local pn = ToEnumShortString(player)
 
+
 -- Height and width of the density graph.
 local height = 64
-local width = IsUsingWideScreen() and 286 or 276
+local width = IsUsingWideScreen() and 286 or 268
 
 local af = Def.ActorFrame{
 	InitCommand=function(self)
-		self:visible( GAMESTATE:IsHumanPlayer(player) )
-		self:xy(_screen.cx-182, _screen.cy+23)
+		self:visible(GAMESTATE:IsHumanPlayer(player))
+		self:xy(IsUsingWideScreen() and  _screen.cx-182 or  _screen.cx-176, _screen.cy+23)
 
 		if player == PLAYER_2 then
 			self:addy(height+24)
@@ -32,6 +33,7 @@ local af = Def.ActorFrame{
 			self:visible(false)
 		end
 	end,
+
 }
 
 -- Background quad for the density graph
@@ -90,6 +92,7 @@ af2[#af2+1] = NPS_Histogram(player, width, height)..{
 	end,
 	RedrawCommand=function(self)
 		self:visible(true)
+
 	end
 }
 -- Don't let the density graph parse the chart.
@@ -107,7 +110,6 @@ af2[#af2+1] = LoadFont("Common Normal")..{
 		else
 			self:addx(-136):addy(-41)
 		end
-
 		-- We want black text in Rainbow mode, white otherwise.
 		self:diffuse(ThemePrefs.Get("RainbowMode") and {0, 0, 0, 1} or {1, 1, 1, 1})
 	end,
@@ -121,6 +123,7 @@ af2[#af2+1] = LoadFont("Common Normal")..{
 			self:visible(true)
 		end
 	end,
+
 }
 
 -- Breakdown
@@ -179,6 +182,7 @@ af2[#af2+1] = Def.ActorFrame{
 	end,
 	PlayerJoinedMessageCommand=function(self, params)
 		self:visible(GAMESTATE:GetNumSidesJoined() == 1)
+
 	end,
 	PlayerUnjoinedMessageCommand=function(self, params)
 		self:visible(GAMESTATE:GetNumSidesJoined() == 1)
@@ -216,7 +220,7 @@ for i, row in ipairs(layout) do
 				if col == "Total Stream" then
 					self:maxwidth(100)
 				end
-				self:xy(-width/2 + 40, -height/2 + 10)
+				self:xy(-width/2 + 40, -height/2 + 13)
 				self:addx((j-1)*colSpacing)
 				self:addy((i-1)*rowSpacing)
 			end,
@@ -249,7 +253,7 @@ for i, row in ipairs(layout) do
 				local textHeight = 17
 				local textZoom = 0.8
 				self:maxwidth(width/textZoom):zoom(textZoom):horizalign(left)
-				self:xy(-width/2 + 50, -height/2 + 10)
+				self:xy(-width/2 + 50, -height/2 + 13)
 				self:addx((j-1)*colSpacing)
 				self:addy((i-1)*rowSpacing)
 			end,
diff --git a/BGAnimations/ScreenSelectMusic overlay/PerPlayer/StepArtist.lua b/BGAnimations/ScreenSelectMusic overlay/PerPlayer/StepArtist.lua
index 6e37811e2..bd7370e9c 100644
--- a/BGAnimations/ScreenSelectMusic overlay/PerPlayer/StepArtist.lua	
+++ b/BGAnimations/ScreenSelectMusic overlay/PerPlayer/StepArtist.lua	
@@ -40,17 +40,17 @@ return Def.ActorFrame{
 				self:x( _screen.cx - (IsUsingWideScreen() and 356 or 346))
 				self:y(_screen.cy + 32)
 			else
-				self:x( _screen.cx - (IsUsingWideScreen() and 356 or 346))
+				self:x( _screen.cx - (IsUsingWideScreen() and 356 or 337))
 				self:y(_screen.cy + 12)
 			end
 
 		elseif player == PLAYER_2 then
 
 			if GAMESTATE:IsCourseMode() then
-				self:x( _screen.cx - 210)
+				self:x( _screen.cx - (IsUsingWideScreen() and 210 or 242))
 				self:y(_screen.cy + 85)
 			else
-				self:x( _screen.cx - 244)
+				self:x( _screen.cx - (IsUsingWideScreen() and 244 or 242))
 				self:y(_screen.cy + 40)
 			end
 		end
diff --git a/BGAnimations/ScreenSelectMusic overlay/StepsDisplayList/Grid.lua b/BGAnimations/ScreenSelectMusic overlay/StepsDisplayList/Grid.lua
index 7961d8dfb..869bc7118 100644
--- a/BGAnimations/ScreenSelectMusic overlay/StepsDisplayList/Grid.lua	
+++ b/BGAnimations/ScreenSelectMusic overlay/StepsDisplayList/Grid.lua	
@@ -7,7 +7,7 @@ local GetStepsToDisplay = LoadActor("./StepsToDisplay.lua")
 
 local t = Def.ActorFrame{
 	Name="StepsDisplayList",
-	InitCommand=function(self) self:xy(_screen.cx-26, _screen.cy + 67) end,
+	InitCommand=function(self) self:xy(IsUsingWideScreen() and _screen.cx-26 or _screen.cx-20 , _screen.cy + 67) end,
 
 	OnCommand=function(self)                           self:queuecommand("RedrawStepsDisplay") end,
 	CurrentSongChangedMessageCommand=function(self)    self:queuecommand("RedrawStepsDisplay") end,