Avoid more nyis

Author: codebycruz

src/plugin/layout.lua

@@ -76,6 +76,14 @@ function Layout:refreshView(window)
 	return ctx.computedLayout
 end
 
+local function hasMouseUp(e) ---@param e Element
+	return e.onmouseup ~= nil
+end
+
+local function hasMouseDownOrClick(e) ---@param e Element
+	return e.onmousedown ~= nil or e.onclick ~= nil
+end
+
 ---@param event Event
 ---@param handler EventHandler
 ---@return Message?
@@ -90,7 +98,7 @@ function Layout:event(event, handler)
 
 		local anyWithMouseDown = false
 		for el, _ in pairs(hoveredElements) do
-			if el.onmousedown then
+			if el.onmousedown or el.onclick then
 				anyWithMouseDown = true
 				break
 			end
@@ -111,20 +119,21 @@ function Layout:event(event, handler)
 		end
 	elseif event.name == "mousePress" then
 		local ctx = self.contexts[event.window]
-		local info = findElementAtPosition(ctx.ui, ctx.computedLayout, event.x, event.y, 0, 0, function(el)
-			return el.onmousedown ~= nil
-		end)
+		local info = findElementAtPosition(ctx.ui, ctx.computedLayout, event.x, event.y, 0, 0, hasMouseDownOrClick)
 
 		if info then
+			if info.element.onclick then
+				return info.element.onclick
+			end
+
 			local relX = event.x - info.absX
 			local relY = event.y - info.absY
+
 			return info.element.onmousedown(relX, relY, info.layout.width, info.layout.height)
 		end
 	elseif event.name == "mouseRelease" then
 		local ctx = self.contexts[event.window]
-		local info = findElementAtPosition(ctx.ui, ctx.computedLayout, event.x, event.y, 0, 0, function(el)
-			return el.onmouseup ~= nil
-		end)
+		local info = findElementAtPosition(ctx.ui, ctx.computedLayout, event.x, event.y, 0, 0, hasMouseUp)
 
 		if info then
 			local relX = event.x - info.absX

src/plugin/ui.lua

@@ -20,6 +20,41 @@ local function convertZ(z)
 	return 1 - math.min(z or 0, 100000) / 1000000
 end
 
+---@param z number
+---@param windowWidth number
+---@param windowHeight number
+---@param vertices number[]
+---@param indices number[]
+local function addBorderQuad(bx, by, bw, bh, color, z, windowWidth, windowHeight, vertices, indices)
+	if bw <= 0 or bh <= 0 then
+		return
+	end
+
+	local baseIdx = #vertices / 10
+	local left = toNDC(bx, windowWidth)
+	local right = toNDC(bx + bw, windowWidth)
+	local top = -toNDC(by, windowHeight)
+	local bottom = -toNDC(by + bh, windowHeight)
+
+	-- stylua: ignore
+	for _, v in ipairs({
+		left, top, convertZ(z + 1), color.r, color.g, color.b, color.a, 0, 0, 0,
+		right, top, convertZ(z + 1), color.r, color.g, color.b, color.a, 0, 0, 0,
+		right, bottom, convertZ(z + 1), color.r, color.g, color.b, color.a, 0, 0, 0,
+		left, bottom, convertZ(z + 1), color.r, color.g, color.b, color.a, 0, 0, 0,
+	}) do
+		table.insert(vertices, v)
+	end
+
+	-- stylua: ignore
+	for _, idx in ipairs({
+		baseIdx, baseIdx + 1, baseIdx + 2,
+		baseIdx, baseIdx + 2, baseIdx + 3,
+	}) do
+		table.insert(indices, idx)
+	end
+end
+
 ---@param layout ComputedLayout
 local function generateLayoutQuads(layout, parentX, parentY, vertices, indices, windowWidth, windowHeight)
 	local x = (parentX or 0) + (layout.x or 0)
@@ -74,54 +109,28 @@ local function generateLayoutQuads(layout, parentX, parentY, vertices, indices,
 		local borderLeft = layout.border.left
 		local borderRight = layout.border.right
 
-		local function addBorderQuad(bx, by, bw, bh, color)
-			if bw <= 0 or bh <= 0 then
-				return
-			end
-
-			local baseIdx = #vertices / 10
-			local left = toNDC(bx, windowWidth)
-			local right = toNDC(bx + bw, windowWidth)
-			local top = -toNDC(by, windowHeight)
-			local bottom = -toNDC(by + bh, windowHeight)
-
-			-- stylua: ignore
-			for _, v in ipairs({
-				left, top, convertZ(z + 1), color.r, color.g, color.b, color.a, 0, 0, 0,
-				right, top, convertZ(z + 1), color.r, color.g, color.b, color.a, 0, 0, 0,
-				right, bottom, convertZ(z + 1), color.r, color.g, color.b, color.a, 0, 0, 0,
-				left, bottom, convertZ(z + 1), color.r, color.g, color.b, color.a, 0, 0, 0,
-			}) do
-				table.insert(vertices, v)
-			end
-
-			-- stylua: ignore
-			for _, idx in ipairs({
-				baseIdx, baseIdx + 1, baseIdx + 2,
-				baseIdx, baseIdx + 2, baseIdx + 3,
-			}) do
-				table.insert(indices, idx)
-			end
-		end
-
 		-- Top border
 		if borderTop and borderTop.width and borderTop.width > 0 and borderTop.style ~= "none" then
-			addBorderQuad(x, y, width, borderTop.width, borderTop.color)
+			addBorderQuad(x, y, width, borderTop.width, borderTop.color, z, windowWidth, windowHeight, vertices, indices)
 		end
 
 		-- Bottom border
 		if borderBottom and borderBottom.width and borderBottom.width > 0 and borderBottom.style ~= "none" then
-			addBorderQuad(x, y + height - borderBottom.width, width, borderBottom.width, borderBottom.color)
+			addBorderQuad(x, y + height - borderBottom.width, width, z, borderBottom.width, borderBottom.color,
+				windowWidth,
+				windowHeight, vertices, indices)
 		end
 
 		-- Left border
 		if borderLeft and borderLeft.width and borderLeft.width > 0 and borderLeft.style ~= "none" then
-			addBorderQuad(x, y, borderLeft.width, height, borderLeft.color)
+			addBorderQuad(x, y, borderLeft.width, height, borderLeft.color, z, windowWidth, windowHeight, vertices,
+				indices)
 		end
 
 		-- Right border
 		if borderRight and borderRight.width and borderRight.width > 0 and borderRight.style ~= "none" then
-			addBorderQuad(x + width - borderRight.width, y, borderRight.width, height, borderRight.color)
+			addBorderQuad(x + width - borderRight.width, y, borderRight.width, height, borderRight.color, z, windowWidth,
+				windowHeight, vertices, indices)
 		end
 	end
 

src/ui/element.lua

@@ -73,9 +73,7 @@ end
 ---@generic T
 ---@param message T
 function Element:onClick(message)
-	self.onmousedown = function()
-		return message
-	end
+	self.onclick = message
 	return self
 end