Update font weight and popup size

This commit is contained in:
Linventif 2024-02-10 00:59:17 +01:00
parent d55e160320
commit ee5c170560
3 changed files with 54 additions and 14 deletions

View File

@ -0,0 +1,23 @@
local colorTbl = {
["background"] = Color(41, 44, 54),
["primary"] = Color(58, 62, 73),
["primary-active"] = Color(58, 62, 73, 163), -- Adjusted alpha for opacity
["secondary"] = Color(44, 47, 59),
["secondary-active"] = Color(31, 33, 40),
["green"] = Color(78, 151, 53),
["green-active"] = Color(58, 122, 38),
["orange"] = Color(204, 145, 62),
["orange-active"] = Color(168, 122, 43),
["red"] = Color(201, 59, 59),
["red-active"] = Color(168, 43, 43),
["blue"] = Color(67, 197, 214),
["blue-active"] = Color(41, 152, 167),
["purple"] = Color(73, 90, 252),
["purple-active"] = Color(47, 63, 159),
["font"] = Color(255, 255, 255),
["font-secondary"] = Color(179, 179, 179)
}
function gmInte.getColor(name)
return colorTbl[name]
end

View File

@ -1,7 +1,7 @@
surface.CreateFont("GmodIntegration_Roboto_16", { surface.CreateFont("GmodIntegration_Roboto_16", {
font = "Roboto", font = "Roboto",
size = 16, size = 16,
weight = 500, weight = 100,
antialias = true, antialias = true,
shadow = false shadow = false
}) })

View File

@ -1,27 +1,26 @@
function gmInte.openVerifPopup() function gmInte.openVerifPopup()
local frame = vgui.Create("DFrame") local frame = vgui.Create("DFrame")
frame:SetSize(400, 140) frame:SetSize(400, 200)
frame:Center() frame:Center()
frame:SetTitle("Gmod Integration - Verification Required") frame:SetTitle("Gmod Integration - Verification Required")
frame:SetDraggable(false) frame:SetDraggable(false)
frame:ShowCloseButton(false) frame:ShowCloseButton(false)
frame:MakePopup() frame:MakePopup()
frame.Paint = function(self, w, h)
draw.RoundedBox(8, 0, 0, w, h, gmInte.getColor("background"))
end
local messagePanel = vgui.Create("DPanel", frame) local messageLabel = vgui.Create("DLabel", frame)
messagePanel:Dock(TOP)
messagePanel:SetSize(300, 40)
messagePanel:DockMargin(10, 0, 10, 10)
messagePanel:SetBackgroundColor(Color(0, 0, 0, 0))
local messageLabel = vgui.Create("DLabel", messagePanel)
messageLabel:Dock(FILL) messageLabel:Dock(FILL)
messageLabel:SetText("Hey! It looks like you haven't linked your Steam account to Discord yet. This is required to play on this server. Please click the button below to link your account. After you've done that, click the refresh button.") messageLabel:DockMargin(10, 0, 10, 0)
messageLabel:SetText("Hey,\nIt looks like you haven't linked your Steam account to Discord yet. This is required to play on this server. Please click the button below to link your account.\n\nAfter you've done that, click the refresh button.")
messageLabel:SetContentAlignment(5) messageLabel:SetContentAlignment(5)
messageLabel:SetFont("GmodIntegration_Roboto_16")
messageLabel:SetWrap(true) messageLabel:SetWrap(true)
local buttonGrid = vgui.Create("DGrid", frame) local buttonGrid = vgui.Create("DGrid", frame)
buttonGrid:Dock(BOTTOM) buttonGrid:Dock(BOTTOM)
buttonGrid:DockMargin(5, 10, 5, 5) buttonGrid:DockMargin(10, 0, 10, 10)
buttonGrid:SetCols(2) buttonGrid:SetCols(2)
buttonGrid:SetColWide(frame:GetWide() / 2 - 10) buttonGrid:SetColWide(frame:GetWide() / 2 - 10)
buttonGrid:SetRowHeight(35) buttonGrid:SetRowHeight(35)
@ -31,8 +30,16 @@ function gmInte.openVerifPopup()
button.DoClick = function() button.DoClick = function()
gui.OpenURL("https://verif.gmod-integration.com") gui.OpenURL("https://verif.gmod-integration.com")
end end
button:SetSize(buttonGrid:GetColWide(), buttonGrid:GetRowHeight()) button:SetSize(buttonGrid:GetColWide() - 10, buttonGrid:GetRowHeight())
buttonGrid:AddItem(button) buttonGrid:AddItem(button)
button:SetTextColor(Color(255, 255, 255))
button.Paint = function(self, w, h)
local color = gmInte.getColor("primary")
if self:IsHovered() then
color = gmInte.getColor("primary-active")
end
draw.RoundedBox(8, 0, 0, w, h, color)
end
local button = vgui.Create("DButton") local button = vgui.Create("DButton")
button:SetText("Refresh Verification") button:SetText("Refresh Verification")
@ -45,6 +52,16 @@ function gmInte.openVerifPopup()
LocalPlayer():ChatPrint("Failed to refresh verification: " .. err) LocalPlayer():ChatPrint("Failed to refresh verification: " .. err)
end) end)
end end
button:SetSize(buttonGrid:GetColWide(), buttonGrid:GetRowHeight()) button:SetSize(buttonGrid:GetColWide() - 10, buttonGrid:GetRowHeight())
buttonGrid:AddItem(button) buttonGrid:AddItem(button)
end button:SetTextColor(Color(255, 255, 255))
button.Paint = function(self, w, h)
local color = gmInte.getColor("primary")
if self:IsHovered() then
color = gmInte.getColor("primary-active")
end
draw.RoundedBox(8, 0, 0, w, h, color)
end
end
gmInte.openVerifPopup()