epicknex/IntroSoftwareProject
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add files via upload

Browse Source
This commit is contained in:
Ryan Ward 2016-12-02 19:48:31 -05:00 committed by GitHub
parent ec98f4ea7c
commit 0e92cb4822
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
client/GuiManager/Text/newTextBox.int
View File

@ -2,6 +2,7 @@ function gui:newTextBox(t,name, x, y, w, h, sx ,sy ,sw ,sh)
x,y,w,h,sx,sy,sw,sh=filter(name, x, y, w, h, sx ,sy ,sw ,sh) x,y,w,h,sx,sy,sw,sh=filter(name, x, y, w, h, sx ,sy ,sw ,sh)
local c=self:newBase("TextBox",name, x, y, w, h, sx ,sy ,sw ,sh) local c=self:newBase("TextBox",name, x, y, w, h, sx ,sy ,sw ,sh)
c.ClearOnFocus=false c.ClearOnFocus=false
c.LoseFocusOnEnter=true
c.Tween=0 c.Tween=0
c.XTween=0 c.XTween=0
c.FontHeight=_defaultfont:getHeight() c.FontHeight=_defaultfont:getHeight()
@ -72,7 +73,11 @@ function gui:newTextBox(t,name, x, y, w, h, sx ,sy ,sw ,sh)
self.cooldown2=true self.cooldown2=true
c.Alarm2:Reset() c.Alarm2:Reset()
elseif (love.keyboard.isDown("return") or love.keyboard.isDown("enter") or love.keyboard.isDown("kpenter")) and self.Active and self.Enter and not(love.keyboard.isDown("lshift") or love.keyboard.isDown("rshift")) then elseif (love.keyboard.isDown("return") or love.keyboard.isDown("enter") or love.keyboard.isDown("kpenter")) and self.Active and self.Enter and not(love.keyboard.isDown("lshift") or love.keyboard.isDown("rshift")) then
if self.LoseFocusOnEnter then
self.Active=false self.Active=false
else
self.Active=true
end
for cc=1,#self.funcE do for cc=1,#self.funcE do
self.funcE[cc](self,self.ttext) self.funcE[cc](self,self.ttext)
end end
@ -91,6 +96,7 @@ function love.textinput(t)
gui.TB[tb].ttext=gui.TB[tb].ttext..t gui.TB[tb].ttext=gui.TB[tb].ttext..t
else else
gui.TB[tb].text=gui.TB[tb].text..t gui.TB[tb].text=gui.TB[tb].text..t
gui.TB[tb].ttext=gui.TB[tb].ttext..t
end end
end end
end end