From 8615cb7edc090e5d2577aefd4b6279d4b687eb8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Elm=C4=81rs=20=C4=80boli=C5=86=C5=A1?=
 <qfluxstudio@gmail.com>
Date: Wed, 16 Jun 2021 07:05:54 +0300
Subject: [PATCH] bug fixes and updates

---
 core/element.lua   | 11 ++++++++++-
 core/input.lua     |  4 ++--
 hooks/onUpdate.lua |  2 +-
 hooks/setPos.lua   |  2 +-
 hooks/setSize.lua  |  4 ++--
 layout/grid.lua    |  1 -
 layout/init.lua    |  2 +-
 7 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/core/element.lua b/core/element.lua
index 2c8c42c..52b356a 100644
--- a/core/element.lua
+++ b/core/element.lua
@@ -18,7 +18,7 @@ setmetatable(element, {
 			self = setmetatable({}, element)
 			self.parentFunc = func
 
-			self:new(param,nil, w, h)
+			self:new(param,nil, w, h, flags)
 			self:createProxies()
 
 			---@type Element
@@ -213,6 +213,11 @@ function element:setParam(p)
 	self.context:bubbleUpdate()
 end
 
+function element:setSize(w, h)
+	self.view.w = w or self.view.w
+	self.view.h = h or self.view.h
+end
+
 function element:setCalculatedSize(w, h)
 	self.view.minW = w or self.view.minW
 	self.view.minH = h or self.view.minH
@@ -312,7 +317,9 @@ function element:externalRender()
 	if self.settings.hasCanvas then
 		lg.translate(self.view.x, self.view.y)
 		setColor(1, 1, 1, 1)
+		lg.setBlendMode('alpha','premultiplied')
 		draw(self.canvas, self.quad, 0, 0)
+		lg.setBlendMode('alpha','alphamultiply')
 	end
 
 	lg.setScissor()
@@ -320,6 +327,7 @@ function element:externalRender()
 end
 
 function element:externalUpdate()
+	self.context:set()
 	self.context:zIndex()
 	if not self.settings.failedCanvas
 		and self.settings.testRenderPasses == 0
@@ -355,6 +363,7 @@ function element:externalUpdate()
 		self.deferRepos = false
 	end
 
+	self.context:unset()
 	return self.settings.remove
 end
 
diff --git a/core/input.lua b/core/input.lua
index 8c8ae82..3d884d0 100644
--- a/core/input.lua
+++ b/core/input.lua
@@ -167,11 +167,11 @@ function subscription:emit(...)
 end
 
 function subscription:checkInside(x, y)
-	return x>self.x and x<self.x+self.w and y>self.y and y<self.y+self.h
+	return x>self.stack.absX and x<self.stack.absX+self.w and y>self.stack.absY and y<self.stack.absY+self.h
 end
 
 function subscription:checkOutside(x, y)
-	return not (x>self.x and x<self.x+self.w and y>self.y and y<self.y+self.h)
+	return not (x>self.stack.absX and x<self.stack.absX+self.w and y>self.stack.absY and y<self.stack.absY+self.h)
 end
 
 ---@alias InputMouseClickSubscriptionCallback fun(x:number, y:number, mouseButton:string)
diff --git a/hooks/onUpdate.lua b/hooks/onUpdate.lua
index 1506998..d4090c7 100644
--- a/hooks/onUpdate.lua
+++ b/hooks/onUpdate.lua
@@ -11,5 +11,5 @@ return function (callback)
 		activeContext.element.callbacks.onUpdate = {}
 	end
 	
-	activeContext.element.callbacks.onUpdate[activeContext.element.callbacks.onUpdate+1] = callback
+	activeContext.element.callbacks.onUpdate[#activeContext.element.callbacks.onUpdate+1] = callback
 end
\ No newline at end of file
diff --git a/hooks/setPos.lua b/hooks/setPos.lua
index 70e8774..18c92dd 100644
--- a/hooks/setPos.lua
+++ b/hooks/setPos.lua
@@ -1,4 +1,4 @@
-local path = string.sub(..., 1, string.len(...) - string.len(".control.size"))
+local path = string.sub(..., 1, string.len(...) - string.len(".hooks.setPos"))
 local stack = require(path..'.core.stack')
 
 --Sets the relative position
diff --git a/hooks/setSize.lua b/hooks/setSize.lua
index ca10138..3277e06 100644
--- a/hooks/setSize.lua
+++ b/hooks/setSize.lua
@@ -1,8 +1,8 @@
-local path = string.sub(..., 1, string.len(...) - string.len(".control.size"))
+local path = string.sub(..., 1, string.len(...) - string.len(".hooks.setSize"))
 local stack = require(path..'.core.stack')
 
 --Sets the computed/minimum size of an element to be used with layout calculations and rendering
 return function(w, h)
     local currentStack = stack.getContext()
-    currentStack.element:setCalculatedSize(w, h)
+    currentStack.element:setSize(w, h)
 end
\ No newline at end of file
diff --git a/layout/grid.lua b/layout/grid.lua
index 78e246b..cde37fa 100644
--- a/layout/grid.lua
+++ b/layout/grid.lua
@@ -187,7 +187,6 @@ function grid:draw(xRoot, yRoot, width, height, children)
 	if (not autoRows) and (not autoCols) then
 
 		if self.gridLayout.layout then
-
 			local layout = {}
 			--flip layout table
 			for x = 1, #self.gridLayout.layout[1] do
diff --git a/layout/init.lua b/layout/init.lua
index cb5da36..5fb23ee 100644
--- a/layout/init.lua
+++ b/layout/init.lua
@@ -147,7 +147,7 @@ function layout:draw()
 		height = math.min(stack:normX(self.vars.width), maxW-x)
 		x = 0
 	end
-
+	
 	self.callback(self.binder, x, y, width, height, children, self.vars.hpad, self.vars.vpad)
 end