summaryrefslogtreecommitdiff
path: root/gamemode/client
diff options
context:
space:
mode:
authorAlexander Pickering <alexandermpickering@gmail.com>2016-05-04 18:29:57 -0400
committerAlexander Pickering <alexandermpickering@gmail.com>2016-05-04 18:29:57 -0400
commitb78c6e09b5d53c37e45e2f7dcab117590fb3a787 (patch)
tree8eaa6e37e8efd9db1170e1b6357998bb89e79bbf /gamemode/client
parent8b995358401b7f1e967efe79eb9080df462c09ea (diff)
downloadgmstranded-b78c6e09b5d53c37e45e2f7dcab117590fb3a787.tar.gz
gmstranded-b78c6e09b5d53c37e45e2f7dcab117590fb3a787.tar.bz2
gmstranded-b78c6e09b5d53c37e45e2f7dcab117590fb3a787.zip
Re-fixed inventory tools menu
Diffstat (limited to 'gamemode/client')
-rw-r--r--gamemode/client/cl_inventory.lua23
1 files changed, 17 insertions, 6 deletions
diff --git a/gamemode/client/cl_inventory.lua b/gamemode/client/cl_inventory.lua
index d3bdd52..13e1f62 100644
--- a/gamemode/client/cl_inventory.lua
+++ b/gamemode/client/cl_inventory.lua
@@ -513,9 +513,15 @@ function PANEL:Init()
draw.RoundedBox( 4, 0, 0, self:GetWide(), self:GetTall(), Color( 75, 75, 75 ) )
end
- self.ControlPanel = vgui.Create("DForm",self)
+ self.Encapsulate = vgui.Create("DScrollPanel",self)
+ self.Encapsulate:SetSize((dPanelWidth/3)*2,dPanelHeight)
+ --self.Encapsulate:SetSize(200,200)
+ self.Encapsulate:SetPos(dPanelWidth/3,0)
+ --self.Encapsulate:EnableVerticalScrollbar(true)
+
+ self.ControlPanel = vgui.Create("DForm")
self.ControlPanel:SetSize((dPanelWidth*2)/3,dPanelWidth)
- self.ControlPanel:SetPos(dPanelWidth/3,0)
+ self.Encapsulate:AddItem(self.ControlPanel)
self.PanelProxy = {}
self.PanelProxy.cp = self.ControlPanel
@@ -557,6 +563,7 @@ function PANEL:Init()
elseif(type == "Color") then
local color = vgui.Create( "DRGBPicker" )
local color_cube = vgui.Create( "DColorCube" )
+ color_cube:SetSize(200,200)
local colorvars = {}
local curcolor = {}
for k,v in pairs({"Red","Green","Blue"}) do
@@ -593,13 +600,17 @@ function PANEL:Init()
self.cp:AddItem(DComboBox)
elseif(type == "PropSelect") then
local grid = vgui.Create( "DGrid" )
- grid:SetPos( 10, 30 )
- grid:SetCols( 5 )
- grid:SetColWide( 36 )
+ grid:SetSize(256,64)
+ grid:SetPos( 0, 0 )
+ grid:SetCols( 3 )
+ grid:SetColWide( 128 )
+ grid:SetRowHeight(64)
for k,v in pairs(table.Models) do
local icon = vgui.Create( "DModelPanel", Panel )
- icon:SetSize( 32, 32 )
+ icon:SetSize( 64, 64 )
icon:SetModel( k )
+ icon:SetCamPos( Vector( 15,15,15 ) )
+ icon:SetLookAt( Vector( 0, 0, 1 ) )
icon.DoClick = function()
GetConVar(table.ConVar):SetString(k)
end