canvas overhaul

sys/modules/opus/ui/components/MenuBar.lua

@@ -3,16 +3,6 @@ local UI    = require('opus.ui')
 
 local colors = _G.colors
 
-local function getPosition(element)
-	local x, y = 1, 1
-	repeat
-		x = element.x + x - 1
-		y = element.y + y - 1
-		element = element.parent
-	until not element
-	return x, y
-end
-
 UI.MenuBar = class(UI.Window)
 UI.MenuBar.defaults = {
 	UIElement = 'MenuBar',
@@ -22,7 +12,6 @@ UI.MenuBar.defaults = {
 	textColor = colors.black,
 	spacing = 2,
 	lastx = 1,
-	showBackButton = false,
 	buttonClass = 'MenuItem',
 }
 function UI.MenuBar:postInit()
@@ -62,10 +51,6 @@ function UI.MenuBar:addButtons(buttons)
 			else
 				table.insert(self.children, button)
 			end
-
-			if button.dropdown then
-				button.dropmenu = UI.DropMenu { buttons = button.dropdown }
-			end
 		end
 	end
 	if self.parent then
@@ -78,23 +63,27 @@ function UI.MenuBar:getActive(menuItem)
 end
 
 function UI.MenuBar:eventHandler(event)
-	if event.type == 'button_press' and event.button.dropmenu then
-		if event.button.dropmenu.enabled then
-			event.button.dropmenu:hide()
-			self:refocus()
-			return true
-		else
-			local x, y = getPosition(event.button)
-			if x + event.button.dropmenu.width > self.width then
-				x = self.width - event.button.dropmenu.width + 1
-			end
-			for _,c in pairs(event.button.dropmenu.children) do
-				if not c.spacer then
-					c.inactive = not self:getActive(c)
-				end
-			end
-			event.button.dropmenu:show(x, y + 1)
+	if event.type == 'button_press' and event.button.dropdown then
+		local function getPosition(element)
+			local x, y = 1, 1
+			repeat
+				x = element.x + x - 1
+				y = element.y + y - 1
+				element = element.parent
+			until not element
+			return x, y
 		end
+
+		local x, y = getPosition(event.button)
+
+		local menu = UI.DropMenu {
+			buttons = event.button.dropdown,
+			x = x,
+			y = y + 1,
+			lastFocus = event.button.uid,
+		}
+		self.parent:add({ dropmenu = menu })
+
 		return true
 	end
 end