From eeb2c4e44dc3cdbf9eeb521bc810181561b3c999 Mon Sep 17 00:00:00 2001
From: Misterkister <misterk1217@hotmail.com>
Date: Sun, 12 Mar 2017 20:11:07 -0500
Subject: [PATCH] Remove white quad from SMO select music screen (#66)

Patching online select music by removing white quad
---
 .../currentsort.lua                           | 45 +++++++------------
 1 file changed, 15 insertions(+), 30 deletions(-)

diff --git a/Themes/Til Death/BGAnimations/ScreenNetSelectBase overlay/currentsort.lua b/Themes/Til Death/BGAnimations/ScreenNetSelectBase overlay/currentsort.lua
index 387a5240ea..0bfc641fc3 100644
--- a/Themes/Til Death/BGAnimations/ScreenNetSelectBase overlay/currentsort.lua	
+++ b/Themes/Til Death/BGAnimations/ScreenNetSelectBase overlay/currentsort.lua	
@@ -1,4 +1,4 @@
-local t = Def.ActorFrame{}
+local t = Def.ActorFrame{};
 
 local frameWidth = 280
 local frameHeight = 20
@@ -30,47 +30,32 @@ local sortTable = {
 	SortOrder_Endless 				= 'Endless',
 	SortOrder_Length 				= 'Song Length',
 	SortOrder_Roulette 				= 'Roulette',
-	SortOrder_Recent 				= 'Recently Played'
+	SortOrder_Recent 				= 'Recently Played',
+	SortOrder_Favorites				= 'Favorites'
 }
 
 t[#t+1] = Def.Quad{
-	Name="CurrentSort",
-	InitCommand=cmd(xy,frameX,frameY;halign,1;zoomto,frameWidth,frameHeight;diffuse,getMainColor("positive"))
-}
+	Name="CurrentSort";
+	InitCommand=cmd(xy,frameX,frameY;halign,1;zoomto,frameWidth,frameHeight;diffuse,getMainColor('frames'););
+};
 
-t[#t+1] = LoadFont("Common Normal") .. {
-	InitCommand=cmd(xy,frameX-frameWidth+5,frameY;halign,0;zoom,0.45;maxwidth,(frameWidth-40)/0.45),
-	BeginCommand=cmd(queuecommand,"Set"),
+t[#t+1] = LoadFont("Common Large") .. {
+	InitCommand=cmd(xy,frameX,frameY+5;halign,1;zoom,0.55;maxwidth,(frameWidth-40)/0.35);
+	BeginCommand=cmd(queuecommand,"Set");
 	SetCommand=function(self)
 		local sort = GAMESTATE:GetSortOrder()
 		local song = GAMESTATE:GetCurrentSong()
 		if sort == nil then
 			self:settext("Sort: ")
 		elseif sort == "SortOrder_Group" and song ~= nil then
-			self:settext(song:GetGroupName())
+			self:settext(song:GetGroupName()) 
 		else
 			self:settext("Sort: "..sortTable[sort])
 		end
-	end,
-	SortOrderChangedMessageCommand=cmd(queuecommand,"Set"),
-	CurrentSongChangedMessageCommand=cmd(queuecommand,"Set")
-}
 
-t[#t+1] = LoadFont("Common Normal") .. {
-	InitCommand=cmd(xy,frameX-5,frameY;halign,1;zoom,0.3;maxwidth,40/0.45),
-	BeginCommand=cmd(queuecommand,"Set"),
-	SetCommand=function(self)
-		local top = SCREENMAN:GetTopScreen()
-		if top:GetName() == "ScreenSelectMusic" or top:GetName() == "ScreenNetSelectMusic" then
-			local wheel = top:GetChild("MusicWheel")
-			self:settextf("%d/%d",wheel:GetCurrentIndex()+1,wheel:GetNumItems())
-		elseif top:GetName() == "ScreenNetRoom" then
-			local wheel = top:GetChild("RoomWheel")
-			self:settextf("%d/%d",wheel:GetCurrentIndex()+1,wheel:GetNumItems())
-		end
-	end,
-	SortOrderChangedMessageCommand=cmd(queuecommand,"Set"),
-	CurrentSongChangedMessageCommand=cmd(queuecommand,"Set")
-}
+	end;
+	SortOrderChangedMessageCommand=cmd(queuecommand,"Set";diffuse,getMainColor('positive'));
+	CurrentSongChangedMessageCommand=cmd(queuecommand,"Set");
+};
 
-return t
\ No newline at end of file
+return t