From b78c6e09b5d53c37e45e2f7dcab117590fb3a787 Mon Sep 17 00:00:00 2001
From: Alexander Pickering <alexandermpickering@gmail.com>
Date: Wed, 4 May 2016 18:29:57 -0400
Subject: Re-fixed inventory tools menu

---
 gamemode/client/cl_inventory.lua | 23 +++++++++++++++++------
 gamemode/server/database.lua     |  4 ++++
 2 files changed, 21 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
diff --git a/gamemode/server/database.lua b/gamemode/server/database.lua
index 9c4a827..b736bfb 100644
--- a/gamemode/server/database.lua
+++ b/gamemode/server/database.lua
@@ -59,6 +59,10 @@ local function convertTableStatic(tbl)
 
 
 
+end
+
+local function convertTableCompressed(tbl)
+
 end
 
 local function parseStaticTable(tbl)
-- 
cgit v1.2.3-70-g09d2