Merge branch 'master' of https://github.com/Pulsar-Dev/pixel-ui

lua/autorun/sh_pixelui_loader.lua

@@ -11,9 +11,9 @@
 	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 	GNU General Public License for more details.
 
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <https://www.gnu.org/licenses/>.
---]]
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+    You should have received a copy of the GNU General Public License
+]]
 
 PIXEL = PIXEL or {}
 PIXEL.UI = PIXEL.UI or {}

lua/pixelui/elements/cl_avatar.lua

@@ -11,12 +11,13 @@
 	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 	GNU General Public License for more details.
 
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <https://www.gnu.org/licenses/>.
---]]
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+    You should have received a copy of the GNU General Public License
+]]
 
 local PANEL = {}
 
+AccessorFunc(PANEL, "Rounding", "Rounding", FORCE_NUMBER)
 AccessorFunc(PANEL, "MaskSize", "MaskSize", FORCE_NUMBER)
 
 function PANEL:Init()
@@ -68,4 +69,63 @@ function PANEL:Paint(w, h)
     render.ClearStencil()
 end
 
-vgui.Register("PIXEL.Avatar", PANEL, "Panel")
+vgui.Register("PIXEL.Avatar", PANEL, "Panel")
+
+
+-- old avatar
+
+PANEL = {}
+
+AccessorFunc(PANEL, "MaskSize", "MaskSize", FORCE_NUMBER)
+
+function PANEL:Init()
+    PIXEL.Warn("Please update to using PIXEL.Avatar instead of using PIXEL.OldAvatar! This panel is deprecated and may be removed in a future release.")
+    self.Avatar = vgui.Create("AvatarImage", self)
+    self.Avatar:SetPaintedManually(true)
+
+    self.CirclePoly = {}
+    self:SetRounding(10)
+end
+
+function PANEL:PerformLayout(w, h)
+    self.Avatar:SetSize(w, h)
+end
+
+function PANEL:SetPlayer(ply, size)
+    self.Avatar:SetPlayer(ply, size)
+end
+
+function PANEL:SetSteamID(id, size)
+    self.Avatar:SetSteamID(id, size)
+end
+
+function PANEL:Paint(w, h)
+    render.ClearStencil()
+    render.SetStencilEnable(true)
+
+    render.SetStencilWriteMask(1)
+    render.SetStencilTestMask(1)
+
+    render.SetStencilFailOperation(STENCILOPERATION_REPLACE)
+    render.SetStencilPassOperation(STENCILOPERATION_ZERO)
+    render.SetStencilZFailOperation(STENCILOPERATION_ZERO)
+    render.SetStencilCompareFunction(STENCILCOMPARISONFUNCTION_NEVER)
+    render.SetStencilReferenceValue(1)
+
+    PIXEL.DrawFullRoundedBox(self:GetRounding() or self:GetMaskSize(), 0, 0, w, h, color_white)
+
+    render.SetStencilFailOperation(STENCILOPERATION_ZERO)
+    render.SetStencilPassOperation(STENCILOPERATION_REPLACE)
+    render.SetStencilZFailOperation(STENCILOPERATION_ZERO)
+    render.SetStencilCompareFunction(STENCILCOMPARISONFUNCTION_EQUAL)
+    render.SetStencilReferenceValue(1)
+
+    self.Avatar:SetPaintedManually(false)
+    self.Avatar:PaintManual()
+    self.Avatar:SetPaintedManually(true)
+
+    render.SetStencilEnable(false)
+    render.ClearStencil()
+end
+
+vgui.Register("PIXEL.OldAvatar", PANEL, "Panel")

lua/pixelui/elements/cl_category.lua

@@ -13,8 +13,7 @@
 
 	You should have received a copy of the GNU General Public License
 	along with this program.  If not, see <https://www.gnu.org/licenses/>.
---]]
-
+]]
 local PANEL = {}
 AccessorFunc(PANEL, "Title", "Title", FORCE_STRING)
 PIXEL.RegisterFont("UI.CategoryHeader", "Rubik", 19, 600)

lua/pixelui/elements/cl_combo_box.lua

@@ -29,7 +29,6 @@ function PANEL:Init()
     self:SetTextAlign(TEXT_ALIGN_LEFT)
     self:SetSortItems(true)
     self:SetSounds(false)
-    self:SetSounds(false)
 end
 
 function PANEL:PerformLayout(w, h)
@@ -48,6 +47,7 @@ function PANEL:Clear()
     if not self.Menu then return end
     self.Menu:Remove()
     self:OnClose()
+    self:OnClose()
     self.Menu = nil
 end
 
@@ -87,6 +87,10 @@ function PANEL:ChooseOption(value, index)
         index = table.KeyFromValue(self.Data, value)
     end
 
+    if not index then
+        index = table.KeyFromValue(self.Data, value)
+    end
+
     self.selected = index
     local choicesKey = table.KeyFromValue(self.Choices, value)
 
@@ -96,6 +100,14 @@ function PANEL:ChooseOption(value, index)
         self:SetIcon(nil)
     end
 
+    local choicesKey = table.KeyFromValue(self.Choices, value)
+
+    if self.ChoiceIcons[choicesKey] then
+        self:SetIcon(self.ChoiceIcons[choicesKey])
+    else
+        self:SetIcon(nil)
+    end
+
     self:OnSelect(index, value, self.Data[index])
 
     if not self:GetSizeToText() then return end
@@ -188,6 +200,8 @@ function PANEL:OpenMenu(pControlOpener)
         if not IsValid(self) then return end
         PIXEL.PlayExpand("close")
         self:OnClose()
+        PIXEL.PlayExpand("close")
+        self:OnClose()
         self:SetToggle(false)
     end
 end
@@ -227,12 +241,6 @@ end
 function PANEL:OnClose()
 end
 
-function PANEL:OnOpen()
-end
-
-function PANEL:OnClose()
-end
-
 function PANEL:PaintOver(w, h)
     local dropBtnSize = PIXEL.Scale(8)
     PIXEL.DrawImgur(w - dropBtnSize - PIXEL.Scale(8), h / 2 - dropBtnSize / 2, dropBtnSize, dropBtnSize, "IP0UlBl", PIXEL.Colors.PrimaryText)

lua/pixelui/elements/cl_frame.lua

@@ -11,10 +11,9 @@
 	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 	GNU General Public License for more details.
 
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <https://www.gnu.org/licenses/>.
---]]
-
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <https://www.gnu.org/licenses/>.
+]]
 local PANEL = {}
 AccessorFunc(PANEL, "Draggable", "Draggable", FORCE_BOOL)
 AccessorFunc(PANEL, "Sizable", "Sizable", FORCE_BOOL)
@@ -291,9 +290,6 @@ end
 function PANEL:PaintMore(w, h)
 end
 
-function PANEL:PaintMore(w, h)
-end
-
 function PANEL:Paint(w, h)
     PIXEL.DrawRoundedBox(8, 0, 0, w, h, PIXEL.Colors.Header)
     local contentX, contentY = self.SideBar and PIXEL.Scale(200) or self.ContentPadding, self.HeaderH

lua/pixelui/elements/cl_menu.lua

@@ -240,6 +240,10 @@ function PANEL:Paint(w, h)
     PIXEL.DrawRoundedBox(8, 0, 0, w, h, self.BackgroundCol)
 end
 
+function PANEL:Paint(w, h)
+    PIXEL.DrawRoundedBox(8, 0, 0, w, h, self.BackgroundCol)
+end
+
 function PANEL:OptionSelectedInternal(option)
     self:OptionSelected(option, option:GetText())
 end

lua/pixelui/elements/cl_sidebar.lua

@@ -11,10 +11,9 @@
 	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 	GNU General Public License for more details.
 
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <https://www.gnu.org/licenses/>.
---]]
-
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <https://www.gnu.org/licenses/>.
+]]
 local PANEL = {}
 AccessorFunc(PANEL, "Name", "Name", FORCE_STRING)
 AccessorFunc(PANEL, "ImgurID", "ImgurID", FORCE_STRING)
@@ -24,7 +23,6 @@ PIXEL.RegisterFont("SidebarItem", "Rubik", 19, 600)
 function PANEL:Init()
     self:SetName("N/A")
     self:SetDrawOutline(true)
-
     self:SetSounds(false)
     self.TextCol = PIXEL.CopyColor(PIXEL.Colors.SecondaryText)
     self.BackgroundCol = PIXEL.CopyColor(PIXEL.Colors.Transparent)
@@ -75,7 +73,6 @@ AccessorFunc(PANEL, "ImgurScale", "ImgurScale", FORCE_NUMBER)
 AccessorFunc(PANEL, "ImgurOffset", "ImgurOffset", FORCE_NUMBER)
 AccessorFunc(PANEL, "ButtonOffset", "ButtonOffset", FORCE_NUMBER)
 AccessorFunc(PANEL, "ButtonBtmOffset", "ButtonBtmOffset", FORCE_NUMBER)
-AccessorFunc(PANEL, "ButtonBtmOffset", "ButtonBtmOffset", FORCE_NUMBER)
 
 function PANEL:Init()
     self.Items = {}

lua/pixelui/elements/cl_text_button.lua

@@ -11,10 +11,9 @@
 	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 	GNU General Public License for more details.
 
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <https://www.gnu.org/licenses/>.
---]]
-
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <https://www.gnu.org/licenses/>.
+]]
 local PANEL = {}
 AccessorFunc(PANEL, "Text", "Text", FORCE_STRING)
 AccessorFunc(PANEL, "TextAlign", "TextAlign", FORCE_NUMBER)

lua/pixelui/elements/cl_text_entry.lua

@@ -11,9 +11,9 @@
 	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 	GNU General Public License for more details.
 
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <https://www.gnu.org/licenses/>.
---]]
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <https://www.gnu.org/licenses/>.
+]]
 
 local PANEL = {}
 

lua/pixelui/sh_config.lua

@@ -21,7 +21,6 @@
     0 = No - forced off.
     1 = No - but users can opt in via convar (pixel_ui_override_popups).
     2 = Yes - but users must opt in via convar.
-    2 = Yes - but users must opt in via convar.
     3 = Yes - forced on.
 ]]
 PIXEL.OverrideDermaMenus = 0