Merge pull request #787 from AntlerForce/master

Minor font tweaks
beyond-all-reason · Oct 29, 2024 · 66231ee · 66231ee
2 parents ed7499e + c627610
commit 66231ee
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 15 deletions.
diff --git a/LuaMenu/widgets/api_rapid_pool_cache.lua b/LuaMenu/widgets/api_rapid_pool_cache.lua
@@ -85,7 +85,7 @@ function widget:Update()
 		cachingLabel = interfaceRoot.GetCachingLabel()
 	end
 	if cachingLabel then 
-		cachingLabel:SetCaption(string.format("Caching % 2d%% % 3dMB/s", (100* current_index)/maxpools, cachingSpeed))
+		cachingLabel:SetCaption(string.format("\255\185\185\185" .. "Caching % 2d%% % 3dMB/s", (100* current_index)/maxpools, cachingSpeed))
 		cachingLabel:Invalidate()
 	end
 	local startTime = Spring.GetTimer()

diff --git a/LuaMenu/widgets/chobby/components/configuration.lua b/LuaMenu/widgets/chobby/components/configuration.lua
@@ -27,7 +27,7 @@ function Configuration:init()
 	self.fontName = "fonts/Poppins-Regular.otf"
 	self.fontRaw = {
 		[0] = {font = "fonts/Poppins-Medium.otf", size = 17, outline = false, shadow = true},
-		[1] = {size = 15, outline = false, shadow = false},
+		[1] = {size = 15, outline = true, shadow = false},
 		[2] = {size = 17, outline = false, shadow = true},
 		[3] = {size = 20, outline = false, shadow = true},
 		[4] = {size = 24, outline = true,  shadow = false},

diff --git a/LuaMenu/widgets/chobby/components/interface_root.lua b/LuaMenu/widgets/chobby/components/interface_root.lua
@@ -98,8 +98,7 @@ function GetInterfaceRoot(optionsParent, mainWindowParent, fontFunction)
 		preserveChildrenOrder = true
 	}
 	lobbyInterfaceHolder.drawTimer = Spring.GetTimer()
-	version_font = WG.Chobby.Configuration:GetFont(1, "version_font", {color = {0.7, 0.7, 0.7, 1}}) -- Grey color
-
+	version_font = WG.Chobby.Configuration:GetFont(1)
 
 	local byarchobbyrapidTag = "unknown"
 	for i,v in ipairs(VFS.GetLoadedArchives()) do 
@@ -111,14 +110,13 @@ function GetInterfaceRoot(optionsParent, mainWindowParent, fontFunction)
 	end
 
 	local label_version = Label:New {
-		--x = "68.5%",
 		y = "95%",
 		width = "20%",
 		height = "5%",
 		right = "2.25%",
 		parent = lobbyInterfaceHolder,
 		objectOverrideFont = version_font,
-		caption = "Game: " .. Configuration.gameConfig.ShortenNameString(Configuration:GetDefaultGameName()) .. "  Engine: " .. Configuration:GetTruncatedEngineVersion() .. "  "
+		caption =  "\255\185\185\185" .. "Game: " .. Configuration.gameConfig.ShortenNameString(Configuration:GetDefaultGameName()) .. "  Engine: " .. Configuration:GetTruncatedEngineVersion() .. "  "
 			.. 'Chobby:' .. byarchobbyrapidTag,
 		align = "right",
 		valign = 'bottom',
@@ -177,16 +175,15 @@ function GetInterfaceRoot(optionsParent, mainWindowParent, fontFunction)
 
 	local cachingLabel 	= Label:New {
 		name = "cachingLabel",
-		x = 4,
-		y = "98%",
-		width = 200,
-		height = 18,
-		--right = "2.25%",
+		x = "1.75%",
+		y = "95%",
+		width = "20%",
+		height = "5%",
 		parent = lobbyInterfaceHolder,
-		objectOverrideFont = WG.Chobby.Configuration:GetFont(1),
+		objectOverrideFont = version_font,
 		caption = "Caching...",
 		align = "left",
-		valign = 'top',
+		valign = 'bottom',
 	}
 	-----------------------------------
 	-- Top middle and top right status

diff --git a/LuaMenu/widgets/gui_community_window.lua b/LuaMenu/widgets/gui_community_window.lua
@@ -830,7 +830,7 @@ local function InitializeControls(window)
 	LeaveIntentionallyBlank(rightLower, "(reserved)")
 
 	-- Populate link panel
-	AddLinkButton(leftCenter, "\255\255\225\20" .. "-  Donate  -",   "NEW: We are once again accepting donations! Support the project now!", "https://www.beyondallreason.info/donate-for-bar",0, 0, "75.5%", 0) --last
+	AddLinkButton(leftCenter, "\255\255\225\20" .. "Donate",   "We are once again accepting donations! Support the project now!", "https://www.beyondallreason.info/donate-for-bar",0, 0, "75.5%", 0) --last
 	AddLinkButton(leftCenter, "Code of Conduct",  "Code of conduct and terms of use", "https://www.beyondallreason.info/code-of-conduct", 0, 0, "50.5%", "25.5%") --third
 	AddLinkButton(leftCenter, "Website", "Visit our website for more, opens https://www.beyondallreason.info/", "https://www.beyondallreason.info/",   0, 0, "25.5%", "50.5%") --second
 	AddLinkButton(leftCenter, "Join our Discord", "Opens a link to https://discord.gg/N968ddE in your browser.", "https://discord.gg/N968ddE", 0, 0, 0, "75.5%") --first

diff --git a/LuaMenu/widgets/gui_modoptions_panel.lua b/LuaMenu/widgets/gui_modoptions_panel.lua
@@ -882,7 +882,7 @@ end
 				local name = option.name and option.name or key
 				text = text .. "\255\255\255\255"
 				if text ~= "\255\255\255\255" then
-					text = text .. "\255\120\120\120" .. "------" .. "\n"
+					text = text .. "\255\128\128\128" .. "------" .. "\n"
 				end
 				text = text .. tostring(name).. " = \255\255\255\255"
 				if (key:sub(1,10) == "tweakunits" or key:sub(1,9) == "tweakdefs") then