samuelmaddock/gm-mediaplayer
1
0
Fork 0
mirror of https://github.com/samuelmaddock/gm-mediaplayer.git synced 2025-03-04 03:03:02 -05:00
Code Issues Packages Projects Releases Wiki Activity

Sidebar now appears while holding down C

Browse Source
This commit is contained in:
samuelmaddock 2014-08-15 22:34:48 -04:00
parent 89846b4378
commit 0ee6c99519
2 changed files with 40 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
lua/mediaplayer/menu/sidebar.lua
View File

@ -1,16 +1,16 @@
include "volume_control.lua"
local PANEL = {}
function PANEL:Init()
self:SetPaintBackground( true )
self:SetPaintBackgroundEnabled( false )
self:SetPaintBackgroundEnabled( true )
self:SetPaintBorderEnabled( false )
self:SetKeyboardInputEnabled( false )
self:SetMouseInputEnabled( true )
self.VolumeControls = vgui.Create( "MP.VolumeControls" )
self.VolumeControls = vgui.Create( "MP.VolumeControl", self )
self.VolumeControls:Dock( BOTTOM )
end
@ -21,26 +21,45 @@ end
function PANEL:Paint(w, h)
surface.SetDrawColor( 0, 0, 0, 140 )
surface.DrawRect( 0, 0, w, h )
end
function PANEL:PerformLayout()
self:Center()
self:AlignLeft( 10 )
end
local MP_SIDEBAR = vgui.RegisterTable( PANEL, "EditablePanel" )
function MediaPlayer.OpenSidebar()
local sidebar = MediaPlayer.Sidebar
function MediaPlayer.ShowSidebar()
local sidebar = MediaPlayer._Sidebar
if not ValidPanel( sidebar ) then
sidebar = vgui.CreateFromTable( MP_SIDEBAR )
end
sidebar:Open()
sidebar:Show()
MediaPlayer.Sidebar = sidebar
MediaPlayer._Sidebar = sidebar
end
function MediaPlayer.HideSidebar()
local sidebar = MediaPlayer._Sidebar
if ValidPanel( sidebar ) then
sidebar:Remove()
MediaPlayer._Sidebar = nil
end
end
control.AddKeyPress( KEY_C, "MP.ShowSidebar", MediaPlayer.ShowSidebar )
control.AddKeyRelease( KEY_C, "MP.HideSidebar", MediaPlayer.HideSidebar )

40
lua/mediaplayer/menu/volume_control.lua
View File

@ -7,13 +7,15 @@ PANEL.Margin = 12
function PANEL:Init()
self.BaseClass.Init( self )
self.VolumeButton = vgui.Create( "MP.VolumeButton", self )
-- self.VolumeSlider = vgui.Create( "MP.VolumeSlider", self )
-- self.VolumeSlider:Dock( FILL )
local lrMargin = self.Margin * 2
self.VolumeSlider:DockMargin( lrMargin, 0, lrMargin, 0 )
-- local lrMargin = self.Margin * 2
-- self.VolumeSlider:DockMargin( lrMargin, 0, lrMargin, 0 )
self.VolumeLabel = vgui.Create( "DLabel", self )
self.VolumeLabel:SetContentAlignment( 5 ) -- center
@ -41,12 +43,12 @@ end
function PANEL:PerformLayout()
self.VolumeButton:CenterVertical()
self.VolumeButton:AlignLeft( self.Margin )
-- self.VolumeButton:CenterVertical()
-- self.VolumeButton:AlignLeft( self.Margin )
self.VolumeLabel:SizeToContents()
self.VolumeLabel:CenterVertical()
self.VolumeLabel:AlignLeft( self.Margin )
-- self.VolumeLabel:SizeToContents()
-- self.VolumeLabel:CenterVertical()
-- self.VolumeLabel:AlignLeft( self.Margin )
end
@ -59,16 +61,7 @@ local VolumeIconMat = Material( "mediaplayer/ui/volume.png" )
function VOLUME_BUTTON:Init()
self:SetPaintBackground( true )
self:SetPaintBackgroundEnabled( false )
self:SetPaintBorderEnabled( false )
self:SetKeyboardInputEnabled( false )
self:SetMouseInputEnabled( true )
self.VolumeControls = vgui.Create( "MP.VolumeControl" )
self.VolumeControls:Dock( BOTTOM )
self.BaseClass.Init( self )
end
@ -86,23 +79,14 @@ function VOLUME_BUTTON:DoClick()
end
derma.DefineControl( "MP.VolumeButton", "", PANEL, "DLabel" )
derma.DefineControl( "MP.VolumeButton", "", VOLUME_BUTTON, "DLabel" )
local VOLUME_SLIDER = {}
function VOLUME_SLIDER:Init()
self:SetPaintBackground( true )
self:SetPaintBackgroundEnabled( false )
self:SetPaintBorderEnabled( false )
self:SetKeyboardInputEnabled( false )
self:SetMouseInputEnabled( true )
self.VolumeControls = vgui.Create( "MP.VolumeControl" )
self.VolumeControls:Dock( BOTTOM )
self.BaseClass.Init( self )
end