Skip to content

Commit

Permalink
Remove all imgur references
Browse files Browse the repository at this point in the history
  • Loading branch information
@Lythium4848
Lythium4848 committed Aug 18, 2023
1 parent d18e3ea commit 7e6b909
Show file tree
Hide file tree
Showing 6 changed files with 220 additions and 161 deletions.
6 changes: 5 additions & 1 deletion lua/pixelui/drawing/cl_overheads.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ local function drawOverhead(ent, pos, text, ang, scale)
PIXEL.DrawRoundedBox(12, x, y, h, h, PIXEL.Colors.Primary)
PIXEL.DrawRoundedBoxEx(12, x + (h - 12), y + h - 20, w + 15, 20, PIXEL.Colors.Primary, false, false, false, true)
PIXEL.DrawText(text, "UI.Overhead", x + h + 15, y + 8, PIXEL.Colors.PrimaryText)
PIXEL.DrawImgur(x + 10, y + 10, h - 20, h - 20, Icon, color_white)
PIXEL.DrawImage(x + 10, y + 10, h - 20, h - 20, Icon, color_white)
end
end3d2d()

Expand Down Expand Up @@ -95,6 +95,10 @@ end

function PIXEL.EnableIconOverheads(new)
local oldIcon = Icon
local imgurMatch = new:match("^%w+$")
if imgurMatch then
new = "https://i.imgur.com/" .. new .. ".png"
end
Icon = new
return oldIcon
end
2 changes: 1 addition & 1 deletion lua/pixelui/elements/cl_check_box.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ function PANEL:Init()
local boxSize = PIXEL.Scale(20)
self:SetSize(boxSize, boxSize)

self:SetImgurURL("https://pixel-cdn.lythium.dev/i/7u6uph3x6g")
self:SetImageURL("https://pixel-cdn.lythium.dev/i/7u6uph3x6g")

self:SetNormalColor(PIXEL.Colors.Transparent)
self:SetHoverColor(PIXEL.Colors.PrimaryText)
Expand Down
38 changes: 25 additions & 13 deletions lua/pixelui/elements/cl_frame.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,21 @@ AccessorFunc(PANEL, "ScreenLock", "ScreenLock", FORCE_BOOL)
AccessorFunc(PANEL, "RemoveOnClose", "RemoveOnClose", FORCE_BOOL)

AccessorFunc(PANEL, "Title", "Title", FORCE_STRING)
AccessorFunc(PANEL, "ImgurID", "ImgurID", FORCE_STRING)
AccessorFunc(PANEL, "ImgurID", "ImgurID", FORCE_STRING) -- Deprecated
AccessorFunc(PANEL, "ImageURL", "ImageURL", FORCE_STRING)

function PANEL:SetImgurID(id)
assert(type(id) == "string", "bad argument #1 to SetImgurID, string expected, got " .. type(id))
print("[PIXEL UI] PIXEL.Frame:SetImgurID is deprecated, use PIXEL.Frame:SetImageURL instead")
self:SetImageURL("https://i.imgur.com/" .. id .. ".png")
self.ImgurID = id
end

function PANEL:GetImgurID()
print("[PIXEL UI] PIXEL.Frame:GetImgurID is deprecated, use PIXEL.Frame:GetImageURL instead")
return self:GetImageURL():match("https://i.imgur.com/(.-).png")
end

PIXEL.RegisterFont("UI.FrameTitle", "Open Sans Bold", 22)

function PANEL:Init()
Expand Down Expand Up @@ -143,7 +155,7 @@ function PANEL:OnMouseReleased()
self:MouseCapture(false)
end

function PANEL:CreateSidebar(defaultItem, imgurID, imgurScale, imgurYOffset, buttonYOffset)
function PANEL:CreateSidebar(defaultItem, imageURL, imageScale, imageYOffset, buttonYOffset)
if IsValid(self.SideBar) then return end
self.SideBar = vgui.Create("PIXEL.Sidebar", self)

Expand All @@ -154,9 +166,17 @@ function PANEL:CreateSidebar(defaultItem, imgurID, imgurScale, imgurYOffset, but
end)
end

if imgurID then self.SideBar:SetImgurID(imgurID) end
if imgurScale then self.SideBar:SetImgurScale(imgurScale) end
if imgurYOffset then self.SideBar:SetImgurOffset(imgurYOffset) end
if imageURL then
local imgurMatch = imageURL:match("^%w+$")
if imgurMatch then
imageURL = "https://i.imgur.com/" .. imageURL .. ".png"
end

self.SideBar:SetImageURL(imageURL)
end

if imageScale then self.SideBar:SetImageScale(imageScale) end
if imageYOffset then self.SideBar:SetImageOffset(imageYOffset) end
if buttonYOffset then self.SideBar:SetButtonOffset(buttonYOffset) end

return self.SideBar
Expand Down Expand Up @@ -220,14 +240,6 @@ function PANEL:OnClose() end
function PANEL:PaintHeader(x, y, w, h)
PIXEL.DrawRoundedBoxEx(PIXEL.Scale(6), x, y, w, h, PIXEL.Colors.Header, true, true)

local imgurID = self:GetImgurID()
if imgurID then
local iconSize = h * .6
PIXEL.DrawImgur(PIXEL.Scale(6), x + (h - iconSize) / 2, y + iconSize, iconSize, imgurID, color_white)
PIXEL.DrawSimpleText(self:GetTitle(), "UI.FrameTitle", x + PIXEL.Scale(12) + iconSize, y + h / 2, PIXEL.Colors.PrimaryText, nil, TEXT_ALIGN_CENTER)
return
end

local imageURL = self:GetImageURL()
if imageURL then
local iconSize = h * .6
Expand Down
19 changes: 17 additions & 2 deletions lua/pixelui/elements/cl_image_button.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,26 @@
local PANEL = {}

AccessorFunc(PANEL, "ImageURL", "ImageURL", FORCE_STRING)
AccessorFunc(PANEL, "ImageSize", "ImageSize", FORCE_NUMBER)
AccessorFunc(PANEL, "NormalColor", "NormalColor")
AccessorFunc(PANEL, "HoverColor", "HoverColor")
AccessorFunc(PANEL, "ClickColor", "ClickColor")
AccessorFunc(PANEL, "DisabledColor", "DisabledColor")

function PANEL:Init()
self:SetImageURL(PIXEL.ProgressImageURL)
self.ImageCol = PIXEL.CopyColor(color_white)
self:SetImageURL("https://pixel-cdn.lythium.dev/i/loading")

self:SetNormalColor(color_white)
self:SetHoverColor(color_white)
self:SetClickColor(color_white)
self:SetDisabledColor(color_white)

self:SetImageSize(1)
end

function PANEL:PaintBackground(w, h) end

function PANEL:Paint(w, h)
self:PaintBackground(w, h)

Expand All @@ -49,4 +64,4 @@ function PANEL:Paint(w, h)
PIXEL.DrawImage(imageOffset, imageOffset, imageSize, imageSize, self:GetImageURL(), self.ImageCol)
end

vgui.Register("PIXEL.ImageButton", PANEL, "PIXEL.ImgurButton")
vgui.Register("PIXEL.Imagebutton", PANEL, "PIXEL.Button")
62 changes: 23 additions & 39 deletions lua/pixelui/elements/cl_imgur_button.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,50 +18,34 @@
local PANEL = {}

AccessorFunc(PANEL, "ImgurID", "ImgurID", FORCE_STRING)
AccessorFunc(PANEL, "ImageSize", "ImageSize", FORCE_NUMBER)
AccessorFunc(PANEL, "NormalColor", "NormalColor")
AccessorFunc(PANEL, "HoverColor", "HoverColor")
AccessorFunc(PANEL, "ClickColor", "ClickColor")
AccessorFunc(PANEL, "DisabledColor", "DisabledColor")
AccessorFunc(PANEL, "ImgurSize", "ImgurSize", FORCE_NUMBER)

function PANEL:Init()
self.ImageCol = PIXEL.CopyColor(color_white)
self:SetImgurID("635PPvg")

self:SetNormalColor(color_white)
self:SetHoverColor(color_white)
self:SetClickColor(color_white)
self:SetDisabledColor(color_white)

self:SetImageSize(1)
function PANEL:SetImgurID(id)
assert(type(id) == "string", "bad argument #1 to 'SetImgurID' (string expected, got " .. type(id))
print("[PIXEL UI] PIXEL.ImgurButton:SetImgurID is deprecated, use PIXEL.ImageButton:SetImageURL instead.")
self.ImgurID = id
self:SetImageURL("https://i.imgur.com/" .. id .. ".png")
end

function PANEL:PaintBackground(w, h) end

function PANEL:Paint(w, h)
self:PaintBackground(w, h)

local imageSize = h * self:GetImageSize()
local imageOffset = (h - imageSize) / 2

if not self:IsEnabled() then
PIXEL.DrawImgur(imageOffset, imageOffset, imageSize, imageSize, self:GetImgurID(), self:GetDisabledColor())
return
end

local col = self:GetNormalColor()

if self:IsHovered() then
col = self:GetHoverColor()
end
function PANEL:GetImgurID()
print("[PIXEL UI] PIXEL.ImgurButton:GetImgurID is deprecated, use PIXEL.ImageButton:GetImgurID instead.")
return self:GetImageURL():match("https://i.imgur.com/(.*).png")
end

if self:IsDown() or self:GetToggle() then
col = self:GetClickColor()
end
function PANEL:SetImgurSize(size)
assert(type(size) == "number", "bad argument #1 to 'SetImgurSize' (number expected, got " .. type(size))
print("[PIXEL UI] PIXEL.ImgurButton:SetImgurSize is deprecated, use PIXEL.ImageButton:SetImageSize instead.")
self.ImgurSize = size
self:SetImageSize(size, size)
end

self.ImageCol = PIXEL.LerpColor(FrameTime() * 12, self.ImageCol, col)
function PANEL:GetImgurSize()
print("[PIXEL UI] PIXEL.ImgurButton:GetImgurSize is deprecated, use PIXEL.ImageButton:GetImageSize instead.")
return self:GetImageSize()
end

PIXEL.DrawImgur(imageOffset, imageOffset, imageSize, imageSize, self:GetImgurID(), self.ImageCol)
function PANEL:Init()
print("[PIXEL UI] PIXEL.ImgurButton is deprecated, use PIXEL.ImageButton instead.")
end

vgui.Register("PIXEL.ImgurButton", PANEL, "PIXEL.Button")
vgui.Register("PIXEL.ImgurButton", PANEL, "PIXEL.Imagebutton")
Loading

0 comments on commit 7e6b909

Please sign in to comment.