Merge branch 'master' of https://github.com/Stepets/LoveFrames

Conflicts:
	objects/textinput.lua

changelog.txt

@@ -1,5 +1,5 @@
 ================================================
-Version 0.9.9 - Alpha (Release Date TBD)
+Version 0.10 - Alpha (Release Date TBD)
 ================================================
 [ADDED] a new object: tree
 [ADDED] a new object: radiobutton
@@ -22,12 +22,15 @@ Version 0.9.9 - Alpha (Release Date TBD)
 [ADDED] a new columnlist method: SetColumnResizeEnabled(bool)
 [ADDED] a new columnlist method: GetColumnResizeEnabled()
 [ADDED] a new columnlist method: SizeColumnToData()
+[ADDED] a new columnlist method: SetColumnOrder(curid, newid)
 [ADDED] a new columnlistheader method: SetName(name)
 [ADDED] a new scrollbody method: GetScrollBar()
 [ADDED] a new frame method: SetMaxSize(width, height)
 [ADDED] a new frame method: GetMaxSize()
 [ADDED] a new frame method: SetMinSize(width, height)
 [ADDED] a new frame method: GetMinSize()
+[ADDED] a new textinput method: ClearLine(line)
+[ADDED] a new list method: GetAutoScroll()
 
 [FIXED] bug that would cause tabbuttons to be positioned incorrectly when scrolling with the mouse wheel
 [FIXED] collision detection issue caused by list child objects not being updated when outside of their parent's bounding box
@@ -35,12 +38,18 @@ Version 0.9.9 - Alpha (Release Date TBD)
 [FIXED] an error caused by calling base:MoveToTop on an object parented to a panel object
 [FIXED] nested list positioning issues
 [FIXED] textinput.alltextselected being set to true when calling the SelectAll method on an empty single-line textinput
+[FIXED] a bug that allowed frames to be resized when they where not being hovered
+[FIXED] text:GetLines always returning nil
+[FIXED] creating a newline in a multiline textinput with the return key would not reset the object's xoffset
+[FIXED] the last character of a long line in a multiline textinput not being shown due to a text offset calculation issue
 
 [CHANGED] columnlist row colors are now adjusted when a row is removed from the list
 [CHANGED] columnlistarea.rowcolorindex now resets to 1 when the list is cleared
 [CHANGED] columnlist:SetRowColumnText to columnlist:SetCellText
 [CHANGED] columnlist:AdjustColumns to columnlist:PositionColumns
 [CHANGED] license to zlib/libpng
+[CHANGED] the loveframes table is now returned by init.lua
+[CHANGED] template files are now expected to return a template table instead of calling loveframes.templates.Register
 
 ================================================
 Version 0.9.8.1 - Alpha (May 17 - 2014)

init.lua

@@ -4,9 +4,11 @@
 --]]------------------------------------------------
 
 local path = ...
-
--- central library table
-loveframes = {}
+require(path .. ".libraries.util")
+require(path .. ".libraries.skins")
+require(path .. ".libraries.templates")
+require(path .. ".libraries.debug")
+local loveframes = require(path .. ".libraries.common")
 
 -- library info
 loveframes.author = "Kenny Shields"
@@ -39,60 +41,22 @@ loveframes.basicfontsmall = love.graphics.newFont(10)
 loveframes.objects = {}
 loveframes.collisions = {}
 
---[[---------------------------------------------------------
-	- func: load()
-	- desc: loads the library
---]]---------------------------------------------------------
-function loveframes.load()
+-- install directory of the library
+local dir = loveframes.config["DIRECTORY"] or path
 
-	-- install directory of the library
-	local dir = loveframes.config["DIRECTORY"] or path
+-- require the internal base libraries
+loveframes.class = require(dir .. ".third-party.middleclass")
+require(dir .. ".libraries.util")
+require(dir .. ".libraries.skins")
+require(dir .. ".libraries.templates")
+require(dir .. ".libraries.debug")
 
-	-- require the internal base libraries
-	loveframes.class = require(dir .. ".third-party.middleclass")
-	require(dir .. ".libraries.util")
-	require(dir .. ".libraries.skins")
-	require(dir .. ".libraries.templates")
-	require(dir .. ".libraries.debug")
+-- replace all "." with "/" in the directory setting
+dir = dir:gsub("\\", "/"):gsub("(%a)%.(%a)", "%1/%2")
+loveframes.config["DIRECTORY"] = dir
 
-	-- replace all "." with "/" in the directory setting
-	dir = dir:gsub("\\", "/"):gsub("(%a)%.(%a)", "%1/%2")
-	loveframes.config["DIRECTORY"] = dir
-	
-	-- create a list of gui objects, skins and templates
-	local objects = loveframes.util.GetDirectoryContents(dir .. "/objects")
-	local skins = loveframes.util.GetDirectoryContents(dir .. "/skins")
-	local templates = loveframes.util.GetDirectoryContents(dir .. "/templates")
-	
-	-- loop through a list of all gui objects and require them
-	for k, v in ipairs(objects) do
-		if v.extension == "lua" then
-			require(v.requirepath)
-		end
-	end
-	
-	-- loop through a list of all gui templates and require them
-	for k, v in ipairs(templates) do
-		if v.extension == "lua" then
-			require(v.requirepath)
-		end
-	end
-	
-	-- loop through a list of all gui skins and require them
-	for k, v in ipairs(skins) do
-		if v.extension == "lua" then
-			require(v.requirepath)
-		end
-	end
-	
-	-- create the base gui object
-	local base = loveframes.objects["base"]
-	loveframes.base = base:new()
-	
-	-- enable key repeat
-	love.keyboard.setKeyRepeat(true)
-	
-end
+-- enable key repeat
+love.keyboard.setKeyRepeat(true)
 
 --[[---------------------------------------------------------
 	- func: update(deltatime)
@@ -454,5 +418,35 @@ function loveframes.GetState()
 	
 end
 
--- load the library
-loveframes.load()
+-- create a list of gui objects, skins and templates
+local objects = loveframes.util.GetDirectoryContents(dir .. "/objects")
+local skins = loveframes.util.GetDirectoryContents(dir .. "/skins")
+local templates = loveframes.util.GetDirectoryContents(dir .. "/templates")
+
+-- loop through a list of all gui objects and require them
+for k, v in ipairs(objects) do
+	if v.extension == "lua" then
+		require(v.requirepath)
+	end
+end
+
+-- loop through a list of all gui templates and require them
+for k, v in ipairs(templates) do
+	if v.extension == "lua" then
+		local template = require(v.requirepath)
+		loveframes.templates.Register(template)
+	end
+end
+
+-- loop through a list of all gui skins and require them
+for k, v in ipairs(skins) do
+	if v.extension == "lua" then
+		require(v.requirepath)
+	end
+end
+
+-- create the base gui object
+local base = loveframes.objects["base"]
+loveframes.base = base:new()
+
+return loveframes

libraries/common.lua

@@ -0,0 +1 @@
+return {}

libraries/debug.lua

@@ -3,6 +3,10 @@
 	-- Copyright (c) 2012-2014 Kenny Shields --
 --]]------------------------------------------------
 
+-- get the current require path
+local path = string.sub(..., 1, string.len(...) - string.len(".debug"))
+local loveframes = require(path .. ".common")
+
 -- debug library
 loveframes.debug = {}
 

libraries/skins.lua

@@ -3,6 +3,10 @@
 	-- Copyright (c) 2012-2014 Kenny Shields --
 --]]------------------------------------------------
 
+-- get the current require path
+local path = string.sub(..., 1, string.len(...) - string.len(".skins"))
+local loveframes = require(path .. ".common")
+
 -- skins library
 loveframes.skins = {}
 

libraries/templates.lua

@@ -3,6 +3,10 @@
 	-- Copyright (c) 2012-2014 Kenny Shields --
 --]]------------------------------------------------
 
+-- get the current require path
+local path = string.sub(..., 1, string.len(...) - string.len(".templates"))
+local loveframes = require(path .. ".common")
+
 -- templates library
 loveframes.templates = {}
 

libraries/util.lua

@@ -3,6 +3,10 @@
 	-- Copyright (c) 2012-2014 Kenny Shields --
 --]]------------------------------------------------
 
+-- get the current require path
+local path = string.sub(..., 1, string.len(...) - string.len(".util"))
+local loveframes = require(path .. ".common")
+
 -- util library
 loveframes.util = {}
 

objects/base.lua

@@ -3,6 +3,10 @@
 	-- Copyright (c) 2012-2014 Kenny Shields --
 --]]------------------------------------------------
 
+-- get the current require path
+local path = string.sub(..., 1, string.len(...) - string.len(".objects.base"))
+local loveframes = require(path .. ".libraries.common")
+
 -- base object
 local newobject = loveframes.NewObject("base", "loveframes_object_base")
 

objects/button.lua

@@ -3,6 +3,10 @@
 	-- Copyright (c) 2012-2014 Kenny Shields --
 --]]------------------------------------------------
 
+-- get the current require path
+local path = string.sub(..., 1, string.len(...) - string.len(".objects.button"))
+local loveframes = require(path .. ".libraries.common")
+
 -- button object
 local newobject = loveframes.NewObject("button", "loveframes_object_button", true)
 

objects/checkbox.lua

@@ -3,6 +3,10 @@
 	-- Copyright (c) 2012-2014 Kenny Shields --
 --]]------------------------------------------------
 
+-- get the current require path
+local path = string.sub(..., 1, string.len(...) - string.len(".objects.checkbox"))
+local loveframes = require(path .. ".libraries.common")
+
 -- checkbox object
 local newobject = loveframes.NewObject("checkbox", "loveframes_object_checkbox", true)
 

objects/collapsiblecategory.lua

@@ -3,6 +3,10 @@
 	-- Copyright (c) 2012-2014 Kenny Shields --
 --]]------------------------------------------------
 
+-- get the current require path
+local path = string.sub(..., 1, string.len(...) - string.len(".objects.collapsiblecategory"))
+local loveframes = require(path .. ".libraries.common")
+
 -- collapsiblecategory object
 local newobject = loveframes.NewObject("collapsiblecategory", "loveframes_object_collapsiblecategory", true)
 

objects/columnlist.lua

@@ -3,6 +3,10 @@
 	-- Copyright (c) 2012-2014 Kenny Shields --
 --]]------------------------------------------------
 
+-- get the current require path
+local path = string.sub(..., 1, string.len(...) - string.len(".objects.columnlist"))
+local loveframes = require(path .. ".libraries.common")
+
 -- columnlist object
 local newobject = loveframes.NewObject("columnlist", "loveframes_object_columnlist", true)
 

objects/form.lua

@@ -3,6 +3,10 @@
 	-- Copyright (c) 2012-2014 Kenny Shields --
 --]]------------------------------------------------
 
+-- get the current require path
+local path = string.sub(..., 1, string.len(...) - string.len(".objects.form"))
+local loveframes = require(path .. ".libraries.common")
+
 -- form object
 local newobject = loveframes.NewObject("form", "loveframes_object_form", true)
 

objects/frame.lua

@@ -3,6 +3,10 @@
 	-- Copyright (c) 2012-2014 Kenny Shields --
 --]]------------------------------------------------
 
+-- get the current require path
+local path = string.sub(..., 1, string.len(...) - string.len(".objects.frame"))
+local loveframes = require(path .. ".libraries.common")
+
 -- frame object
 local newobject = loveframes.NewObject("frame", "loveframes_object_frame", true)
 

objects/grid.lua

@@ -3,6 +3,10 @@
 	-- Copyright (c) 2012-2014 Kenny Shields --
 --]]------------------------------------------------
 
+-- get the current require path
+local path = string.sub(..., 1, string.len(...) - string.len(".objects.grid"))
+local loveframes = require(path .. ".libraries.common")
+
 -- grid object
 local newobject = loveframes.NewObject("grid", "loveframes_object_grid", true)
 

objects/image.lua

@@ -3,6 +3,10 @@
 	-- Copyright (c) 2012-2014 Kenny Shields --
 --]]------------------------------------------------
 
+-- get the current require path
+local path = string.sub(..., 1, string.len(...) - string.len(".objects.image"))
+local loveframes = require(path .. ".libraries.common")
+
 -- image object
 local newobject = loveframes.NewObject("image", "loveframes_object_image", true)
 

objects/imagebutton.lua

@@ -2,6 +2,9 @@
 	-- Love Frames - A GUI library for LOVE --
 	-- Copyright (c) 2012-2014 Kenny Shields --
 --]]------------------------------------------------
+-- get the current require path
+local path = string.sub(..., 1, string.len(...) - string.len(".objects.imagebutton"))
+local loveframes = require(path .. ".libraries.common")
 
 -- imagebutton object
 local newobject = loveframes.NewObject("imagebutton", "loveframes_object_imagebutton", true)

objects/internal/closebutton.lua

@@ -3,6 +3,10 @@
 	-- Copyright (c) 2012-2014 Kenny Shields --
 --]]------------------------------------------------
 
+-- get the current require path
+local path = string.sub(..., 1, string.len(...) - string.len(".objects.internal.closebutton"))
+local loveframes = require(path .. ".libraries.common")
+
 -- closebutton class
 local newobject = loveframes.NewObject("closebutton", "loveframes_object_closebutton", true)
 

objects/internal/columnlist/columnlistarea.lua

@@ -3,6 +3,10 @@
 	-- Copyright (c) 2012-2014 Kenny Shields --
 --]]------------------------------------------------
 
+-- get the current require path
+local path = string.sub(..., 1, string.len(...) - string.len(".objects.internal.columnlist.columnlistarea"))
+local loveframes = require(path .. ".libraries.common")
+
 -- columnlistarea class
 local newobject = loveframes.NewObject("columnlistarea", "loveframes_object_columnlistarea", true)
 

objects/internal/columnlist/columnlistheader.lua

@@ -3,6 +3,10 @@
 	-- Copyright (c) 2012-2014 Kenny Shields --
 --]]------------------------------------------------
 
+-- get the current require path
+local path = string.sub(..., 1, string.len(...) - string.len(".objects.internal.columnlist.columnlistheader"))
+local loveframes = require(path .. ".libraries.common")
+
 -- columnlistheader class
 local newobject = loveframes.NewObject("columnlistheader", "loveframes_object_columnlistheader", true)
 

objects/internal/columnlist/columnlistrow.lua

@@ -3,6 +3,10 @@
 	-- Copyright (c) 2012-2014 Kenny Shields --
 --]]------------------------------------------------
 
+-- get the current require path
+local path = string.sub(..., 1, string.len(...) - string.len(".objects.internal.columnlist.columnlistrow"))
+local loveframes = require(path .. ".libraries.common")
+
 -- columnlistrow class
 local newobject = loveframes.NewObject("columnlistrow", "loveframes_object_columnlistrow", true)
 

objects/internal/linenumberspanel.lua

@@ -3,6 +3,10 @@
 	-- Copyright (c) 2012-2014 Kenny Shields --
 --]]------------------------------------------------
 
+-- get the current require path
+local path = string.sub(..., 1, string.len(...) - string.len(".objects.internal.linenumberspanel"))
+local loveframes = require(path .. ".libraries.common")
+
 -- linenumberspanel class
 local newobject = loveframes.NewObject("linenumberspanel", "loveframes_object_linenumberspanel", true)
 

objects/internal/menuoption.lua

@@ -3,6 +3,10 @@
 	-- Copyright (c) 2012-2014 Kenny Shields --
 --]]------------------------------------------------
 
+-- get the current require path
+local path = string.sub(..., 1, string.len(...) - string.len(".objects.internal.menuoption"))
+local loveframes = require(path .. ".libraries.common")
+
 -- menuoption object
 local newobject = loveframes.NewObject("menuoption", "loveframes_object_menuoption", true)
 

objects/internal/modalbackground.lua

@@ -3,6 +3,10 @@
 	-- Copyright (c) 2012-2014 Kenny Shields --
 --]]------------------------------------------------
 
+-- get the current require path
+local path = string.sub(..., 1, string.len(...) - string.len(".objects.internal.modalbackground"))
+local loveframes = require(path .. ".libraries.common")
+
 -- modalbackground class
 local newobject = loveframes.NewObject("modalbackground", "loveframes_object_modalbackground", true)
 

objects/internal/multichoice/multichoicelist.lua

@@ -3,6 +3,10 @@
 	-- Copyright (c) 2012-2014 Kenny Shields --
 --]]------------------------------------------------
 
+-- get the current require path
+local path = string.sub(..., 1, string.len(...) - string.len(".objects.internal.multichoice.multichoicelist"))
+local loveframes = require(path .. ".libraries.common")
+
 -- multichoicelist class
 local newobject = loveframes.NewObject("multichoicelist", "loveframes_object_multichoicelist", true)
 

objects/internal/multichoice/multichoicerow.lua

@@ -3,6 +3,10 @@
 	-- Copyright (c) 2012-2014 Kenny Shields --
 --]]------------------------------------------------
 
+-- get the current require path
+local path = string.sub(..., 1, string.len(...) - string.len(".objects.internal.multichoice.multichoicerow"))
+local loveframes = require(path .. ".libraries.common")
+
 -- multichoicerow class
 local newobject = loveframes.NewObject("multichoicerow", "loveframes_object_multichoicerow", true)
 

objects/internal/scrollable/scrollarea.lua

@@ -3,6 +3,10 @@
 	-- Copyright (c) 2012-2014 Kenny Shields --
 --]]------------------------------------------------
 
+-- get the current require path
+local path = string.sub(..., 1, string.len(...) - string.len(".objects.internal.scrollable.scrollarea"))
+local loveframes = require(path .. ".libraries.common")
+
 -- scrollarea class
 local newobject = loveframes.NewObject("scrollarea", "loveframes_object_scrollarea", true)
 

objects/internal/scrollable/scrollbar.lua

@@ -3,6 +3,10 @@
 	-- Copyright (c) 2012-2014 Kenny Shields --
 --]]------------------------------------------------
 
+-- get the current require path
+local path = string.sub(..., 1, string.len(...) - string.len(".objects.internal.scrollable.scrollbar"))
+local loveframes = require(path .. ".libraries.common")
+
 -- scrollbar class
 local newobject = loveframes.NewObject("scrollbar", "loveframes_object_scrollbar", true)
 

objects/internal/scrollable/scrollbody.lua

@@ -3,6 +3,10 @@
 	-- Copyright (c) 2012-2014 Kenny Shields --
 --]]------------------------------------------------
 
+-- get the current require path
+local path = string.sub(..., 1, string.len(...) - string.len(".objects.internal.scrollable.scrollbody"))
+local loveframes = require(path .. ".libraries.common")
+
 -- scrollbar class
 local newobject = loveframes.NewObject("scrollbody", "loveframes_object_scrollbody", true)
 

objects/internal/scrollable/scrollbutton.lua

@@ -3,6 +3,10 @@
 	-- Copyright (c) 2012-2014 Kenny Shields --
 --]]------------------------------------------------
 
+-- get the current require path
+local path = string.sub(..., 1, string.len(...) - string.len(".objects.internal.scrollable.scrollbutton"))
+local loveframes = require(path .. ".libraries.common")
+
 -- scrollbutton clas
 local newobject = loveframes.NewObject("scrollbutton", "loveframes_object_scrollbutton", true)
 

objects/internal/sliderbutton.lua

@@ -3,6 +3,10 @@
 	-- Copyright (c) 2012-2014 Kenny Shields --
 --]]------------------------------------------------
 
+-- get the current require path
+local path = string.sub(..., 1, string.len(...) - string.len(".objects.internal.sliderbutton"))
+local loveframes = require(path .. ".libraries.common")
+
 -- sliderbutton class
 local newobject = loveframes.NewObject("sliderbutton", "loveframes_object_sliderbutton", true)
 

objects/internal/tabbutton.lua

@@ -3,6 +3,10 @@
 	-- Copyright (c) 2012-2014 Kenny Shields --
 --]]------------------------------------------------
 
+-- get the current require path
+local path = string.sub(..., 1, string.len(...) - string.len(".objects.internal.tabbutton"))
+local loveframes = require(path .. ".libraries.common")
+
 -- tabbutton class
 local newobject = loveframes.NewObject("tabbutton", "loveframes_object_tabbutton", true)
 

objects/internal/tooltip.lua

@@ -3,6 +3,10 @@
 	-- Copyright (c) 2012-2014 Kenny Shields --
 --]]------------------------------------------------
 
+-- get the current require path
+local path = string.sub(..., 1, string.len(...) - string.len(".objects.internal.tooltip"))
+local loveframes = require(path .. ".libraries.common")
+
 -- tooltip clas
 local newobject = loveframes.NewObject("tooltip", "loveframes_object_tooltip", true)
 

objects/internal/treenode.lua

@@ -3,6 +3,10 @@
 	-- Copyright (c) 2012-2014 Kenny Shields --
 --]]------------------------------------------------
 
+-- get the current require path
+local path = string.sub(..., 1, string.len(...) - string.len(".objects.internal.treenode"))
+local loveframes = require(path .. ".libraries.common")
+
 -- button object
 local newobject = loveframes.NewObject("treenode", "loveframes_object_treenode", true)
 
@@ -264,6 +268,22 @@ function newobject:AddNode(text)
 	
 end
 
+--[[---------------------------------------------------------
+	- func: RemoveNode(id)
+	- desc: removes a node from the object
+--]]---------------------------------------------------------
+function newobject:RemoveNode(id)
+	
+	id = id + 1
+	for k, v in ipairs(self.internals) do
+		if k == id then
+			v:Remove()
+			break
+		end
+	end
+	
+end
+
 --[[---------------------------------------------------------
 	- func: SetOpen(bool)
 	- desc: sets whether or not the object is open

objects/internal/treenodebutton.lua

@@ -3,6 +3,10 @@
 	-- Copyright (c) 2012-2014 Kenny Shields --
 --]]------------------------------------------------
 
+-- get the current require path
+local path = string.sub(..., 1, string.len(...) - string.len(".objects.internal.treenodebutton"))
+local loveframes = require(path .. ".libraries.common")
+
 -- button object
 local newobject = loveframes.NewObject("treenodebutton", "loveframes_object_treenodebutton", true)
 

objects/list.lua

@@ -3,6 +3,10 @@
 	-- Copyright (c) 2012-2014 Kenny Shields --
 --]]------------------------------------------------
 
+-- get the current require path
+local path = string.sub(..., 1, string.len(...) - string.len(".objects.list"))
+local loveframes = require(path .. ".libraries.common")
+
 -- list object
 local newobject = loveframes.NewObject("list", "loveframes_object_list", true)
 
@@ -700,6 +704,18 @@ function newobject:SetAutoScroll(bool)
 	
 end
 
+--[[---------------------------------------------------------
+	- func: GetAutoScroll()
+	- desc: gets whether or not the list's scrollbar should
+			auto scroll to the bottom when a new object is
+			added to the list
+--]]---------------------------------------------------------
+function newobject:GetAutoScroll()
+
+	return self.autoscroll
+	
+end
+
 --[[---------------------------------------------------------
 	- func: SetButtonScrollAmount(speed)
 	- desc: sets the scroll amount of the object's scrollbar

objects/menu.lua

@@ -3,6 +3,10 @@
 	-- Copyright (c) 2012-2014 Kenny Shields --
 --]]------------------------------------------------
 
+-- get the current require path
+local path = string.sub(..., 1, string.len(...) - string.len(".objects.menu"))
+local loveframes = require(path .. ".libraries.common")
+
 -- menu object
 local newobject = loveframes.NewObject("menu", "loveframes_object_menu", true)
 

objects/multichoice.lua

@@ -3,6 +3,10 @@
 	-- Copyright (c) 2012-2014 Kenny Shields --
 --]]------------------------------------------------
 
+-- get the current require path
+local path = string.sub(..., 1, string.len(...) - string.len(".objects.multichoice"))
+local loveframes = require(path .. ".libraries.common")
+
 -- multichoice object
 local newobject = loveframes.NewObject("multichoice", "loveframes_object_multichoice", true)
 

objects/numberbox.lua

@@ -3,6 +3,10 @@
 	-- Copyright (c) 2012-2014 Kenny Shields --
 --]]------------------------------------------------
 
+-- get the current require path
+local path = string.sub(..., 1, string.len(...) - string.len(".objects.numberbox"))
+local loveframes = require(path .. ".libraries.common")
+
 -- numberbox object
 local newobject = loveframes.NewObject("numberbox", "loveframes_object_numberbox", true)
 

objects/panel.lua

@@ -3,6 +3,10 @@
 	-- Copyright (c) 2012-2014 Kenny Shields --
 --]]------------------------------------------------
 
+-- get the current require path
+local path = string.sub(..., 1, string.len(...) - string.len(".objects.panel"))
+local loveframes = require(path .. ".libraries.common")
+
 -- panel object
 local newobject = loveframes.NewObject("panel", "loveframes_object_panel", true)
 

objects/progressbar.lua

@@ -3,6 +3,10 @@
 	-- Copyright (c) 2012-2014 Kenny Shields --
 --]]------------------------------------------------
 
+-- get the current require path
+local path = string.sub(..., 1, string.len(...) - string.len(".objects.progressbar"))
+local loveframes = require(path .. ".libraries.common")
+
 -- progressbar object
 local newobject = loveframes.NewObject("progressbar", "loveframes_object_progressbar", true)
 

objects/radiobutton.lua

@@ -3,6 +3,10 @@
 	-- Copyright (c) 2012-2014 Kenny Shields --
 --]]------------------------------------------------
 
+-- get the current require path
+local path = string.sub(..., 1, string.len(...) - string.len(".objects.radiobutton"))
+local loveframes = require(path .. ".libraries.common")
+
 -- radiobutton object
 local newobject = loveframes.NewObject("radiobutton", "loveframes_object_radiobutton", true)
 

objects/slider.lua

@@ -3,6 +3,10 @@
 	-- Copyright (c) 2012-2014 Kenny Shields --
 --]]------------------------------------------------
 
+-- get the current require path
+local path = string.sub(..., 1, string.len(...) - string.len(".objects.slider"))
+local loveframes = require(path .. ".libraries.common")
+
 -- slider object
 local newobject = loveframes.NewObject("slider", "loveframes_object_slider", true)
 

objects/tabs.lua

@@ -3,6 +3,10 @@
 	-- Copyright (c) 2012-2014 Kenny Shields --
 --]]------------------------------------------------
 
+-- get the current require path
+local path = string.sub(..., 1, string.len(...) - string.len(".objects.tabs"))
+local loveframes = require(path .. ".libraries.common")
+
 -- tabs object
 local newobject = loveframes.NewObject("tabs", "loveframes_object_tabs", true)
 

objects/text.lua

@@ -8,6 +8,10 @@
 			 experimental and not final
 --]]------------------------------------------------
 
+-- get the current require path
+local path = string.sub(..., 1, string.len(...) - string.len(".objects.text"))
+local loveframes = require(path .. ".libraries.common")
+
 -- text object
 local newobject = loveframes.NewObject("text", "loveframes_object_text", true)
 

objects/textinput.lua

@@ -3,6 +3,10 @@
 	-- Copyright (c) 2012-2014 Kenny Shields --
 --]]------------------------------------------------
 
+-- get the current require path
+local path = string.sub(..., 1, string.len(...) - string.len(".objects.textinput"))
+local loveframes = require(path .. ".libraries.common")
+
 -- textinput object
 local newobject = loveframes.NewObject("textinput", "loveframes_object_textinput", true)
 
@@ -966,7 +970,6 @@ function newobject:UpdateIndicator()
 				if indicatorRelativeX < leftlimit then
 					correction = correction * -1
 				end
-				print(correction)
 				hbody:GetScrollBar():ScrollTo((width + correction) / twidth)
 			end
 		end

objects/tree.lua

@@ -3,6 +3,10 @@
 	-- Copyright (c) 2012-2014 Kenny Shields --
 --]]------------------------------------------------
 
+-- get the current require path
+local path = string.sub(..., 1, string.len(...) - string.len(".objects.tree"))
+local loveframes = require(path .. ".libraries.common")
+
 -- button object
 local newobject = loveframes.NewObject("tree", "loveframes_object_tree", true)
 
@@ -267,6 +271,10 @@ function newobject:mousereleased(x, y, button)
 
 end
 
+--[[---------------------------------------------------------
+	- func: AddNode(text)
+	- desc: adds a node to the object
+--]]---------------------------------------------------------
 function newobject:AddNode(text)
 
 	local node = loveframes.objects["treenode"]:new()
@@ -280,6 +288,21 @@ function newobject:AddNode(text)
 	
 end
 
+--[[---------------------------------------------------------
+	- func: RemoveNode(id)
+	- desc: removes a node from the object
+--]]---------------------------------------------------------
+function newobject:RemoveNode(id)
+	
+	for k, v in ipairs(self.children) do
+		if k == id then
+			v:Remove()
+			break
+		end
+	end
+	
+end
+
 --[[---------------------------------------------------------
 	- func: GetVerticalScrollBody()
 	- desc: gets the object's vertical scroll body

skins/Blue/skin.lua

@@ -3,6 +3,10 @@
 	-- Copyright (c) 2012-2014 Kenny Shields --
 --]]------------------------------------------------
 
+-- get the current require path
+local path = string.sub(..., 1, string.len(...) - string.len(".skins.Blue.skin"))
+local loveframes = require(path .. ".libraries.common")
+
 -- skin table
 local skin = {}
 

skins/Orange/skin.lua

@@ -3,6 +3,10 @@
 	-- Copyright (c) 2012-2014 Kenny Shields --
 --]]------------------------------------------------
 
+-- get the current require path
+local path = string.sub(..., 1, string.len(...) - string.len(".skins.Orange.skin"))
+local loveframes = require(path .. ".libraries.common")
+
 -- skin table
 local skin = {}
 

templates/base.lua

@@ -1 +1 @@
---[[------------------------------------------------
	-- Love Frames - A GUI library for LOVE --
	-- Copyright (c) 2012-2014 Kenny Shields --
--]]------------------------------------------------

--[[------------------------------------------------
	-- note: This is the base template for all
			 Love Frames objects. You should not
			 edit or delete this template unless you 
			 know what you are doing.
--]]------------------------------------------------

-- template table
local template = {}

-- template name
template.name = "Base"

-- template properties
template.properties = {}

template.properties["*"] =
{
	state           = "none",
	x               = 0,
	y               = 0,
	width           = 5,
	height          = 5,
	staticx	        = 0,
	staticy	        = 0,
	draworder       = 0,
	collide         = true,
	internal        = false,
	visible	        = true,
	hover           = false,
	alwaysupdate    = false,
	retainsize      = false,
	calledmousefunc = false,
	skin            = nil,
	clickbounds     = nil,
	Draw            = nil,
	Update          = nil,
	OnMouseEnter    = nil,
	OnMouseExit     = nil
}

-- register the template
loveframes.templates.Register(template)
+--[[------------------------------------------------
	-- Love Frames - A GUI library for LOVE --
	-- Copyright (c) 2012-2014 Kenny Shields --
--]]------------------------------------------------

--[[------------------------------------------------
	-- note: This is the base template for all
			 Love Frames objects. You should not
			 edit or delete this template unless you 
			 know what you are doing.
--]]------------------------------------------------

-- template table
local template = {}

-- template name
template.name = "Base"

-- template properties
template.properties = {}

template.properties["*"] =
{
	state           = "none",
	x               = 0,
	y               = 0,
	width           = 5,
	height          = 5,
	staticx	        = 0,
	staticy	        = 0,
	draworder       = 0,
	collide         = true,
	internal        = false,
	visible	        = true,
	hover           = false,
	alwaysupdate    = false,
	retainsize      = false,
	calledmousefunc = false,
	skin            = nil,
	clickbounds     = nil,
	Draw            = nil,
	Update          = nil,
	OnMouseEnter    = nil,
	OnMouseExit     = nil
}

return template