Version 0.9.3.1 - Alpha (see changelog.txt)

2024-11-18 16:04:22 +00:00 · 2012-09-02 17:13:13 -04:00 · 2012-09-02 17:13:13 -04:00 · d6190b4757
commit d6190b4757
parent 138e335f82
38 changed files with 108 additions and 105 deletions
--- a/changelog.txt
+++ b/changelog.txt
@ -1,7 +1,16 @@
+================================================
+Version 0.9.3.1 - Alpha (Spetember 2 - 2012)
+================================================
+[ADDED] numpad enter key support for textinput.OnEnter
+
+[FIXED] duplicate progressbar:GetCompleted() in progressbar.lua
+
+[CHANGED] textinput.OnTextEnterd to textinput.OnTextChanged
+[CHANGED] textinput.OnTextChanged is now also called when the backspace key is pressed
+
 ================================================
 Version 0.9.3 - Alpha (Spetember 1 - 2012)
 ================================================
-
 [ADDED] a new base method: GetParents()
 [ADDED] a new base method: IsTopInternal()
 [ADDED] a new base method: IsInternal()
--- a/debug.lua
+++ b/debug.lua
@ -1,6 +1,6 @@
 --[[------------------------------------------------
-	-- LÖVE Frames --
-	-- By Kenny Shields --
+	-- Löve Frames --
+	-- Copyright 2012 Kenny Shields --
 --]]------------------------------------------------

 -- debug library
--- a/init.lua
+++ b/init.lua
@ -1,6 +1,6 @@
 --[[------------------------------------------------
-	-- LÖVE Frames --
-	-- By Kenny Shields --
+	-- Löve Frames --
+	-- Copyright 2012 Kenny Shields --
 --]]------------------------------------------------

 -- central library table
@ -9,7 +9,7 @@ loveframes = {}
 -- library info
 loveframes.info = {}
 loveframes.info.author 	= "Nikolai Resokav"
-loveframes.info.version = "0.9.3"
+loveframes.info.version = "0.9.3.1"
 loveframes.info.stage 	= "Alpha"

 -- library configurations
--- a/objects/base.lua
+++ b/objects/base.lua
@ -1,6 +1,6 @@
 --[[------------------------------------------------
-	-- LÖVE Frames --
-	-- By Kenny Shields --
+	-- Löve Frames --
+	-- Copyright 2012 Kenny Shields --
 --]]------------------------------------------------

 -- base object
--- a/objects/button.lua
+++ b/objects/button.lua
@ -1,6 +1,6 @@
 --[[------------------------------------------------
-	-- LÖVE Frames --
-	-- By Kenny Shields --
+	-- Löve Frames --
+	-- Copyright 2012 Kenny Shields --
 --]]------------------------------------------------

 -- button clas
--- a/objects/checkbox.lua
+++ b/objects/checkbox.lua
@ -1,6 +1,6 @@
 --[[------------------------------------------------
-	-- LÖVE Frames --
-	-- By Kenny Shields --
+	-- Löve Frames --
+	-- Copyright 2012 Kenny Shields --
 --]]------------------------------------------------

 -- checkbox class
--- a/objects/collapsiblecategory.lua
+++ b/objects/collapsiblecategory.lua
@ -1,6 +1,6 @@
 --[[------------------------------------------------
-	-- LÖVE Frames --
-	-- By Kenny Shields --
+	-- Löve Frames --
+	-- Copyright 2012 Kenny Shields --
 --]]------------------------------------------------

 -- button clas
--- a/objects/columnlist.lua
+++ b/objects/columnlist.lua
@ -1,6 +1,6 @@
 --[[------------------------------------------------
-	-- LÖVE Frames --
-	-- By Kenny Shields --
+	-- Löve Frames --
+	-- Copyright 2012 Kenny Shields --
 --]]------------------------------------------------

 -- columnlist object
--- a/objects/frame.lua
+++ b/objects/frame.lua
@ -1,6 +1,6 @@
 --[[------------------------------------------------
-	-- LÖVE Frames --
-	-- By Kenny Shields --
+	-- Löve Frames --
+	-- Copyright 2012 Kenny Shields --
 --]]------------------------------------------------

 -- frame class
--- a/objects/image.lua
+++ b/objects/image.lua
@ -1,6 +1,6 @@
 --[[------------------------------------------------
-	-- LÖVE Frames --
-	-- By Kenny Shields --
+	-- Löve Frames --
+	-- Copyright 2012 Kenny Shields --
 --]]------------------------------------------------

 -- progress bar class
--- a/objects/imagebutton.lua
+++ b/objects/imagebutton.lua
@ -1,6 +1,6 @@
 --[[------------------------------------------------
-	-- LÖVE Frames --
-	-- By Kenny Shields --
+	-- Löve Frames --
+	-- Copyright 2012 Kenny Shields --
 --]]------------------------------------------------

 -- imagebutton clas
--- a/objects/internal/closebutton.lua
+++ b/objects/internal/closebutton.lua
@ -1,6 +1,6 @@
 --[[------------------------------------------------
-	-- LÖVE Frames --
-	-- By Kenny Shields --
+	-- Löve Frames --
+	-- Copyright 2012 Kenny Shields --
 --]]------------------------------------------------

 -- closebutton clas
--- a/objects/internal/columnlist/columnlist-listarea.lua
+++ b/objects/internal/columnlist/columnlist-listarea.lua
@ -1,6 +1,6 @@
 --[[------------------------------------------------
-	-- LÖVE Frames --
-	-- By Kenny Shields --
+	-- Löve Frames --
+	-- Copyright 2012 Kenny Shields --
 --]]------------------------------------------------

 -- columnlistarea object
--- a/objects/internal/columnlist/columnlist-row.lua
+++ b/objects/internal/columnlist/columnlist-row.lua
@ -1,6 +1,6 @@
 --[[------------------------------------------------
-	-- LÖVE Frames --
-	-- By Kenny Shields --
+	-- Löve Frames --
+	-- Copyright 2012 Kenny Shields --
 --]]------------------------------------------------

 -- columnlistrow object
--- a/objects/internal/columnlist/coulmnlist-header.lua
+++ b/objects/internal/columnlist/coulmnlist-header.lua
@ -1,6 +1,6 @@
 --[[------------------------------------------------
-	-- LÖVE Frames --
-	-- By Kenny Shields --
+	-- Löve Frames --
+	-- Copyright 2012 Kenny Shields --
 --]]------------------------------------------------

 -- columnlistheader object
--- a/objects/internal/modalbackground.lua
+++ b/objects/internal/modalbackground.lua
@ -1,6 +1,6 @@
 --[[------------------------------------------------
-	-- LÖVE Frames --
-	-- By Kenny Shields --
+	-- Löve Frames --
+	-- Copyright 2012 Kenny Shields --
 --]]------------------------------------------------

 -- modalbackground class
--- a/objects/internal/multichoice/multichoice-list.lua
+++ b/objects/internal/multichoice/multichoice-list.lua
@ -1,6 +1,6 @@
 --[[------------------------------------------------
-	-- LÖVE Frames --
-	-- By Kenny Shields --
+	-- Löve Frames --
+	-- Copyright 2012 Kenny Shields --
 --]]------------------------------------------------

 -- multichoicelist class
--- a/objects/internal/multichoice/multichoice-row.lua
+++ b/objects/internal/multichoice/multichoice-row.lua
@ -1,6 +1,6 @@
 --[[------------------------------------------------
-	-- LÖVE Frames --
-	-- By Kenny Shields --
+	-- Löve Frames --
+	-- Copyright 2012 Kenny Shields --
 --]]------------------------------------------------

 -- multichoicerow class
--- a/objects/internal/scrollable/scrollarea.lua
+++ b/objects/internal/scrollable/scrollarea.lua
@ -1,6 +1,6 @@
 --[[------------------------------------------------
-	-- LÖVE Frames --
-	-- By Kenny Shields --
+	-- Löve Frames --
+	-- Copyright 2012 Kenny Shields --
 --]]------------------------------------------------

 -- scrollbar class
--- a/objects/internal/scrollable/scrollbar.lua
+++ b/objects/internal/scrollable/scrollbar.lua
@ -1,6 +1,6 @@
 --[[------------------------------------------------
-	-- LÖVE Frames --
-	-- By Kenny Shields --
+	-- Löve Frames --
+	-- Copyright 2012 Kenny Shields --
 --]]------------------------------------------------

 -- scrollbar class
--- a/objects/internal/scrollable/scrollbody.lua
+++ b/objects/internal/scrollable/scrollbody.lua
@ -1,6 +1,6 @@
 --[[------------------------------------------------
-	-- LÖVE Frames --
-	-- By Kenny Shields --
+	-- Löve Frames --
+	-- Copyright 2012 Kenny Shields --
 --]]------------------------------------------------

 -- scrollbar class
--- a/objects/internal/scrollable/scrollbutton.lua
+++ b/objects/internal/scrollable/scrollbutton.lua
@ -1,6 +1,6 @@
 --[[------------------------------------------------
-	-- LÖVE Frames --
-	-- By Kenny Shields --
+	-- Löve Frames --
+	-- Copyright 2012 Kenny Shields --
 --]]------------------------------------------------

 -- scrollbutton clas
--- a/objects/internal/sliderbutton.lua
+++ b/objects/internal/sliderbutton.lua
@ -1,6 +1,6 @@
 --[[------------------------------------------------
-	-- LÖVE Frames --
-	-- By Kenny Shields --
+	-- Löve Frames --
+	-- Copyright 2012 Kenny Shields --
 --]]------------------------------------------------

 -- closebutton clas
--- a/objects/internal/tabbutton.lua
+++ b/objects/internal/tabbutton.lua
@ -1,6 +1,6 @@
 --[[------------------------------------------------
-	-- LÖVE Frames --
-	-- By Kenny Shields --
+	-- Löve Frames --
+	-- Copyright 2012 Kenny Shields --
 --]]------------------------------------------------

 -- tabbutton clas
--- a/objects/internal/tooltip.lua
+++ b/objects/internal/tooltip.lua
@ -1,6 +1,6 @@
 --[[------------------------------------------------
-	-- LÖVE Frames --
-	-- By Kenny Shields --
+	-- Löve Frames --
+	-- Copyright 2012 Kenny Shields --
 --]]------------------------------------------------

 -- tooltip clas
--- a/objects/list.lua
+++ b/objects/list.lua
@ -1,6 +1,6 @@
 --[[------------------------------------------------
-	-- LÖVE Frames --
-	-- By Kenny Shields --
+	-- Löve Frames --
+	-- Copyright 2012 Kenny Shields --
 --]]------------------------------------------------

 -- list class
--- a/objects/multichoice.lua
+++ b/objects/multichoice.lua
@ -1,6 +1,6 @@
 --[[------------------------------------------------
-	-- LÖVE Frames --
-	-- By Kenny Shields --
+	-- Löve Frames --
+	-- Copyright 2012 Kenny Shields --
 --]]------------------------------------------------

 -- progress bar class
--- a/objects/panel.lua
+++ b/objects/panel.lua
@ -1,6 +1,6 @@
 --[[------------------------------------------------
-	-- LÖVE Frames --
-	-- By Kenny Shields --
+	-- Löve Frames --
+	-- Copyright 2012 Kenny Shields --
 --]]------------------------------------------------

 -- panel class
--- a/objects/progressbar.lua
+++ b/objects/progressbar.lua
@ -1,9 +1,9 @@
 --[[------------------------------------------------
-	-- LÖVE Frames --
-	-- By Kenny Shields --
+	-- Löve Frames --
+	-- Copyright 2012 Kenny Shields --
 --]]------------------------------------------------

-- progress bar class
+-- progressbar class
 progressbar = class("progressbar", base)
 progressbar:include(loveframes.templates.default)

@ -287,9 +287,10 @@ end

 --[[---------------------------------------------------------
 	- func: GetCompleted()
-	- desc: gets the value of object.completed
+	- desc: gets whether or not the object has reached it's
+			maximum value
 --]]---------------------------------------------------------
-function progressbar:GetLerpRate()
+function progressbar:GetCompleted()

 	return self.completed
 	
--- a/objects/slider.lua
+++ b/objects/slider.lua
@ -1,6 +1,6 @@
 --[[------------------------------------------------
-	-- LÖVE Frames --
-	-- By Kenny Shields --
+	-- Löve Frames --
+	-- Copyright 2012 Kenny Shields --
 --]]------------------------------------------------

 -- text clas
--- a/objects/tabs.lua
+++ b/objects/tabs.lua
@ -1,6 +1,6 @@
 --[[------------------------------------------------
-	-- LÖVE Frames --
-	-- By Kenny Shields --
+	-- Löve Frames --
+	-- Copyright 2012 Kenny Shields --
 --]]------------------------------------------------

 -- tabs class
--- a/objects/text.lua
+++ b/objects/text.lua
@ -1,6 +1,6 @@
 --[[------------------------------------------------
-	-- LÖVE Frames --
-	-- By Kenny Shields --
+	-- Löve Frames --
+	-- Copyright 2012 Kenny Shields --
 --]]------------------------------------------------

 --[[------------------------------------------------
--- a/objects/textinput.lua
+++ b/objects/textinput.lua
@ -1,6 +1,6 @@
 --[[------------------------------------------------
-	-- LÖVE Frames --
-	-- By Kenny Shields --
+	-- Löve Frames --
+	-- Copyright 2012 Kenny Shields --
 --]]------------------------------------------------

 -- textinput clas
@ -39,7 +39,7 @@ function textinput:initialize()
 	self.focus				= false
 	self.internal			= false
 	self.OnEnter			= nil
-	self.OnTextEntered		= nil
+	self.OnTextChanged		= nil
 	
 end

@ -259,30 +259,20 @@ function textinput:RunKey(key, unicode)
 	self.unicode = unicode
 	
 	if key == "left" then
-		if self.alltextselected == true then
-			self.alltextselected = false
-			self.blinknum = 0
-		else
-			self:MoveBlinker(-1)
-			if blinkx <= self.x  and blinknum ~= 0 then
-				local width = self.font:getWidth(self.text:sub(blinknum, blinknum + 1))
-				self.xoffset = self.xoffset + width
-			elseif blinknum == 0 and self.xoffset ~= 0 then
-				self.xoffset = 0
-			end
+		self:MoveBlinker(-1)
+		if blinkx <= self.x  and blinknum ~= 0 then
+			local width = self.font:getWidth(self.text:sub(blinknum, blinknum + 1))
+			self.xoffset = self.xoffset + width
+		elseif blinknum == 0 and self.xoffset ~= 0 then
+			self.xoffset = 0
 		end
 	elseif key == "right" then
-		if self.alltextselected == true then
-			self.alltextselected = false
-			self.blinknum = #self.text
-		else
-			self:MoveBlinker(1)
-			if blinkx >= self.x + swidth and blinknum ~= #self.text then
-				local width = self.font:getWidth(self.text:sub(blinknum, blinknum))
-				self.xoffset = self.xoffset - width*2
-			elseif blinknum == #self.text and self.xoffset ~= ((0 - font:getWidth(self.text)) + swidth) and font:getWidth(self.text) + self.textxoffset > self.width then
-				self.xoffset = ((0 - font:getWidth(self.text)) + swidth)
-			end
+		self:MoveBlinker(1)
+		if blinkx >= self.x + swidth and blinknum ~= #self.text then
+			local width = self.font:getWidth(self.text:sub(blinknum, blinknum))
+			self.xoffset = self.xoffset - width*2
+		elseif blinknum == #self.text and self.xoffset ~= ((0 - font:getWidth(self.text)) + swidth) and font:getWidth(self.text) + self.textxoffset > self.width then
+			self.xoffset = ((0 - font:getWidth(self.text)) + swidth)
 		end
 	end
 			
@ -291,12 +281,15 @@ function textinput:RunKey(key, unicode)
 		if text ~= "" then
 			self.text = self:RemoveFromeText(blinknum)
 			self:MoveBlinker(-1)
+			if self.OnTextChanged then
+				self.OnTextChanged(self, "")
+			end
 		end
 		local cwidth = font:getWidth(self.text:sub(#self.text))
 		if self.xoffset ~= 0 then
 			self.xoffset = self.xoffset + cwidth
 		end
-	elseif key == "return" then
+	elseif key == "return" or key == "kpenter" then
 		if self.OnEnter ~= nil then
 			self.OnEnter(self, self.text)
 		end
@ -349,8 +342,8 @@ function textinput:RunKey(key, unicode)
 				self:MoveBlinker(1)
 			end
 			
-			if self.OnTextEntered then
-				self.OnTextEntered(self, ckey)
+			if self.OnTextChanged then
+				self.OnTextChanged(self, ckey)
 			end
 			
 			local cwidth = font:getWidth(ckey)
--- a/skins.lua
+++ b/skins.lua
@ -1,6 +1,6 @@
 --[[------------------------------------------------
-	-- LÖVE Frames --
-	-- By Kenny Shields --
+	-- Löve Frames --
+	-- Copyright 2012 Kenny Shields --
 --]]------------------------------------------------

 loveframes.skins = {}
--- a/skins/Blue/skin.lua
+++ b/skins/Blue/skin.lua
@ -1,6 +1,6 @@
 --[[------------------------------------------------
-	-- LÖVE Frames --
-	-- By Kenny Shields --
+	-- Löve Frames --
+	-- Copyright 2012 Kenny Shields --
 --]]------------------------------------------------

 -- skin table
--- a/skins/Orange/skin.lua
+++ b/skins/Orange/skin.lua
@ -1,6 +1,6 @@
 --[[------------------------------------------------
-	-- LÖVE Frames --
-	-- By Kenny Shields --
+	-- Löve Frames --
+	-- Copyright 2012 Kenny Shields --
 --]]------------------------------------------------

 -- skin table
--- a/templates.lua
+++ b/templates.lua
@ -1,6 +1,6 @@
 --[[------------------------------------------------
-	-- LÖVE Frames --
-	-- By Kenny Shields --
+	-- Löve Frames --
+	-- Copyright 2012 Kenny Shields --
 --]]------------------------------------------------

 -- templates
--- a/util.lua
+++ b/util.lua
@ -1,6 +1,6 @@
 --[[------------------------------------------------
-	-- LÖVE Frames --
-	-- By Kenny Shields --
+	-- Löve Frames --
+	-- Copyright 2012 Kenny Shields --
 --]]------------------------------------------------

 -- util library