edshot99/ulx
1
0
Fork 0
forked from TeamUlysses/ulx
Code Pull Requests Activity

Added Dock support to some elements in xlib

Browse Source
This commit is contained in:
SticklyMan 2023-11-21 05:17:02 -07:00 committed by SticklyMan
parent 061bec4a90
commit dd74755478
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lua/ulx/modules/cl/xlib.lua
View File

@ -9,6 +9,9 @@ function xlib.makecheckbox( t )
local pnl = vgui.Create( "DCheckBoxLabel", t.parent )
pnl:SetPos( t.x, t.y )
pnl:SetText( t.label or "" )
if t.dock then pnl:Dock( t.dock ) end // NODOCK, FILL, LEFT, RIGHT, TOP, BOTTOM
if t.dockmargin then pnl:DockMargin( t.dockmargin[1], t.dockmargin[2], t.dockmargin[3], t.dockmargin[4] ) end
if t.dockpadding then pnl:DockPadding( t.dockpadding[1], t.dockpadding[2], t.dockpadding[3], t.dockpadding[4] ) end
pnl:SizeToContents()
pnl:SetValue( t.value or 0 )
pnl:SetZPos( t.zpos or 0 )
@ -67,6 +70,9 @@ end
function xlib.makelabel( t )
local pnl = vgui.Create( "DLabel", t.parent )
pnl:SetPos( t.x, t.y )
if t.dock then pnl:Dock( t.dock ) end // NODOCK, FILL, LEFT, RIGHT, TOP, BOTTOM
if t.dockmargin then pnl:DockMargin( t.dockmargin[1], t.dockmargin[2], t.dockmargin[3], t.dockmargin[4] ) end
if t.dockpadding then pnl:DockPadding( t.dockpadding[1], t.dockpadding[2], t.dockpadding[3], t.dockpadding[4] ) end
pnl:SetText( t.label or "" )
pnl:SetZPos( t.zpos or 0 )
if not t.tooltipwidth then t.tooltipwidth = 250 end
@ -180,6 +186,9 @@ function xlib.maketextbox( t )
pnl:SetPos( t.x, t.y )
pnl:SetWide( t.w )
pnl:SetTall( t.h or 20 )
if t.dock then pnl:Dock( t.dock ) end // NODOCK, FILL, LEFT, RIGHT, TOP, BOTTOM
if t.dockmargin then pnl:DockMargin( t.dockmargin[1], t.dockmargin[2], t.dockmargin[3], t.dockmargin[4] ) end
if t.dockpadding then pnl:DockPadding( t.dockpadding[1], t.dockpadding[3], t.dockpadding[3], t.dockpadding[4] ) end
pnl:SetEnterAllowed( true )
pnl:SetZPos( t.zpos or 0 )
if t.convar then pnl:SetConVar( t.convar ) end
@ -282,6 +291,9 @@ function xlib.makepanel( t )
local pnl = vgui.Create( "DPanel", t.parent )
pnl:SetPos( t.x, t.y )
pnl:SetSize( t.w, t.h )
if t.dock then pnl:Dock( t.dock ) end // NODOCK, FILL, LEFT, RIGHT, TOP, BOTTOM
if t.dockmargin then pnl:DockMargin( t.dockmargin[1], t.dockmargin[2], t.dockmargin[3], t.dockmargin[4] ) end
if t.dockpadding then pnl:DockPadding( t.dockpadding[1], t.dockpadding[2], t.dockpadding[3], t.dockpadding[4] ) end
pnl:SetZPos( t.zpos or 0 )
if t.skin then pnl:SetSkin( t.skin ) end
if t.visible ~= nil then pnl:SetVisible( t.visible ) end
@ -539,6 +551,9 @@ function xlib.makeslider( t )
pnl:SetWide( t.w or 100 )
pnl:SetTall( t.h or 20 )
pnl:SetText( t.label or "" )
if t.dock then pnl:Dock( t.dock ) end // NODOCK, FILL, LEFT, RIGHT, TOP, BOTTOM
if t.dockmargin then pnl:DockMargin( t.dockmargin[1], t.dockmargin[2], t.dockmargin[3], t.dockmargin[4] ) end
if t.dockpadding then pnl:DockPadding( t.dockpadding[1], t.dockpadding[2], t.dockpadding[3], t.dockpadding[4] ) end
pnl:SetMinMax( t.min or 0, t.max or 100 )
pnl:SetDecimals( t.decimal or 0 )
pnl.TextArea:SetDrawBackground( true )
@ -1198,4 +1213,4 @@ local function fadeAnim_end( data )
if data.panelOut then data.panelOut:SetVisible( false ) end
if data.panelIn then data.panelIn:SetAlpha( 255 ) end
end
xlib.registerAnimType( "pnlFade", fadeAnim_run, fadeAnim_start, fadeAnim_end )
xlib.registerAnimType( "pnlFade", fadeAnim_run, fadeAnim_start, fadeAnim_end )

2
ulx.build
View File

@ -1 +1 @@
1689226740
1700569022