some small touchups to tabs

etternagame · Jul 7, 2021 · e2a985a · e2a985a
1 parent db21b2c
commit e2a985a
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 14 deletions.
diff --git a/Themes/Til Death/BGAnimations/ScreenSelectMusic decorations/playlists.lua b/Themes/Til Death/BGAnimations/ScreenSelectMusic decorations/playlists.lua
@@ -128,7 +128,7 @@ t[#t + 1] =
 	LoadFont("Common Normal") ..
 	{
 		InitCommand = function(self)
-			self:xy(frameX + 5, frameY + offsetY - 9):zoom(0.6):halign(0)
+			self:xy(frameX + 5, frameY + offsetY - 11):zoom(0.65):halign(0)
 			self:diffuse(Saturation(getMainColor("positive"), 0.1))
 			self:settext(translated_info["Title"])
 		end
@@ -137,7 +137,7 @@ t[#t + 1] =
 	LoadFont("Common Normal") ..
 	{
 		InitCommand = function(self)
-			self:xy(frameWidth, frameY + offsetY - 9):zoom(0.6):halign(1)
+			self:xy(frameWidth, frameY + offsetY - 11):zoom(0.65):halign(1)
 		end,
 		DisplaySinglePlaylistMessageCommand = function(self)
 			self:settext(translated_info["ExplainAdd"])
@@ -513,7 +513,7 @@ r[#r + 1] =
 	LoadFont("Common Large") ..
 		{
 			InitCommand = function(self)
-				self:x(300):halign(0):zoom(0.3):diffuse(getMainColor("positive"))
+				self:x(capWideScale(280,300)):halign(0):zoom(0.3):diffuse(getMainColor("positive"))
 				self:settext(translated_info["Next"])
 			end,
 			DisplayAllMessageCommand = function(self)
@@ -778,7 +778,7 @@ r[#r + 1] =
 	LoadFont("Common Large") ..
 		{
 			InitCommand = function(self)
-				self:x(300):halign(0):zoom(0.3):diffuse(getMainColor("positive"))
+				self:x(capWideScale(280,300)):halign(0):zoom(0.3):diffuse(getMainColor("positive"))
 				self:settext(translated_info["Next"])
 			end,
 			DisplaySinglePlaylistMessageCommand = function(self)

diff --git a/Themes/Til Death/BGAnimations/ScreenSelectMusic decorations/songsearch.lua b/Themes/Til Death/BGAnimations/ScreenSelectMusic decorations/songsearch.lua
@@ -106,6 +106,11 @@ local t =
 				self:queuecommand("Set")
 			end
 		},
+	Def.Quad {
+		InitCommand = function(self)
+			self:xy(frameX - capWideScale(3.5,-3.5), frameY - 46):zoomto(capWideScale(362.5,472), 44):align(0,0.5):diffuse(getMainColor("tabs"))
+		end,
+	},
 	LoadFont("Common Large") ..
 		{
 			InitCommand = function(self)

diff --git a/Themes/Til Death/BGAnimations/ScreenSelectMusic decorations/tags.lua b/Themes/Til Death/BGAnimations/ScreenSelectMusic decorations/tags.lua
@@ -168,7 +168,7 @@ t[#t + 1] =
 	LoadFont("Common Normal") ..
 	{
 		InitCommand = function(self)
-			self:xy(frameX + 5, frameY + offsetY - 9):zoom(0.6):halign(0)
+			self:xy(frameX + 5, frameY + offsetY - 11.5):zoom(0.65):halign(0)
 			self:settext(translated_info["Title"])
 			self:diffuse(Saturation(getMainColor("positive"), 0.1))
 		end
@@ -489,7 +489,7 @@ r[#r + 1] =
 		},
 	Def.Quad {
 		InitCommand = function(self)
-			self:addx(377):addy(3):zoomto(250, 21):halign(1):diffuse(color("#666666"))
+			self:addx(129):addy(3):zoomto(capWideScale(210,250), 21):halign(0):diffuse(color("#666666"))
 		end,
 		MouseLeftClickMessageCommand = function(self)
 			if isOver(self) and onTab then
@@ -515,7 +515,7 @@ r[#r + 1] =
 	LoadFont("Common Large") ..
 		{
 			InitCommand = function(self)
-				self:addx(133):addy(1):halign(0):maxwidth(600):zoom(fontScale - 0.05)
+				self:addx(133):addy(2):halign(0):maxwidth(600):zoom(fontScale - 0.05)
 			end,
 			BORPBORPNORFNORFcCommand = function(self)
 				self:settext(curInput)
@@ -640,7 +640,7 @@ r[#r + 1] =
 	LoadFont("Common Large") ..
 		{
 			InitCommand = function(self)
-				self:x(300):halign(0):zoom(0.3):diffuse(getMainColor("positive")):settext(translated_info["Next"])
+				self:x(capWideScale(270,300)):halign(0):zoom(0.3):diffuse(getMainColor("positive")):settext(translated_info["Next"])
 			end,
 			MouseLeftClickMessageCommand = function(self)
 				if isOver(self) and currenttagpage < numtagpages then
@@ -652,7 +652,7 @@ r[#r + 1] =
 	LoadFont("Common Large") ..
 		{
 			InitCommand = function(self)
-				self:x(175):halign(0.5):zoom(0.3)
+				self:x(capWideScale(160,175)):halign(0.5):zoom(0.3)
 				self:aux(1)
 			end,
 			BORPBORPNORFNORFcCommand = function(self)

diff --git a/Themes/Til Death/BGAnimations/goaldisplay.lua b/Themes/Til Death/BGAnimations/goaldisplay.lua
@@ -166,9 +166,6 @@ local o =
 				self:xy(c1x, headeroff):zoom(tzoom):halign(0.5):settext(translated_info["RateLong"])
 				self:diffuse(getMainColor("positive"))
 			end,
-			UpdateCommand = function(self)
-				self:settext(translated_info["RateShort"])
-			end,
 			HighlightCommand = function(self)
 				highlightIfOver(self)
 			end,
@@ -205,7 +202,7 @@ local o =
 				self:xy(width / 2, headeroff):zoom(tzoom):halign(0.5)
 			end,
 			UpdateCommand = function(self)
-				self:settextf("%i-%i", ind + 1, ind + numgoals)
+				self:settextf("%i-%i (%i)", ind + 1, ind + numgoals, #goaltable)
 			end
 		},
 	LoadFont("Common normal") ..

diff --git a/Themes/Til Death/Languages/en.ini b/Themes/Til Death/Languages/en.ini
@@ -642,7 +642,7 @@ ChartCount=Number of charts
 AverageRating=Average Rating
 
 [TabTags]
-Title=Player Tags
+Title=Tags
 AddTag=Add new tag
 ExcludeMode=Exclude mode
 Mode=Mode