some basics wip stuff

This commit is contained in:
Paul Liverman III 2016-11-24 21:32:04 -08:00
parent 92da91076e
commit 3ec0067799
5 changed files with 8 additions and 2 deletions

3
.gitmodules vendored
View File

@ -1,3 +1,6 @@
[submodule "lib/bitser"] [submodule "lib/bitser"]
path = lib/bitser path = lib/bitser
url = https://github.com/gvx/bitser url = https://github.com/gvx/bitser
[submodule "lib/middleclass"]
path = lib/middleclass
url = https://github.com/kikito/middleclass.git

View File

@ -39,7 +39,7 @@ do
local _exp_1 = self.data.vertical local _exp_1 = self.data.vertical
if "center" == _exp_1 then if "center" == _exp_1 then
self.data.y = self.data.y + ((self.parent.data.h - self.data.h) / 2) self.data.y = self.data.y + ((self.parent.data.h - self.data.h) / 2)
elseif "right" == _exp_1 then elseif "bottom" == _exp_1 then
self.data.y = self.data.y + (self.parent.data.h - self.data.h) self.data.y = self.data.y + (self.parent.data.h - self.data.h)
end end
if toPixel then if toPixel then

View File

@ -62,7 +62,7 @@ class element
switch @data.vertical switch @data.vertical
when "center" when "center"
@data.y += (@parent.data.h - @data.h) / 2 @data.y += (@parent.data.h - @data.h) / 2
when "right" when "bottom"
@data.y += @parent.data.h - @data.h @data.y += @parent.data.h - @data.h
if toPixel if toPixel

1
lib/middleclass Submodule

@ -0,0 +1 @@
Subproject commit 27a64f107e61532006030a6168e4fe6a71eee9a2

View File

@ -6,3 +6,5 @@ pop = require ""
--- @todo write this! --- @todo write this!
print(pop, pop.elements) --NOTE TEMPORARY print(pop, pop.elements) --NOTE TEMPORARY
return --this is to prevent default returning of last statement