From e6d1e58ce223671b7a8e0e780f5fbc84306b5f84 Mon Sep 17 00:00:00 2001 From: "kepler155c@gmail.com" Date: Sun, 14 Apr 2019 17:44:29 -0400 Subject: [PATCH] drop dowm menus resize fix --- sys/apis/ui/components/DropMenu.lua | 11 +++++++---- sys/apps/network/proxy.lua | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/sys/apis/ui/components/DropMenu.lua b/sys/apis/ui/components/DropMenu.lua index 79f1a8a..10ad096 100644 --- a/sys/apis/ui/components/DropMenu.lua +++ b/sys/apis/ui/components/DropMenu.lua @@ -10,8 +10,8 @@ UI.DropMenu.defaults = { backgroundColor = colors.white, buttonClass = 'DropMenuItem', } -function UI.DropMenu:setParent() - UI.MenuBar.setParent(self) +function UI.DropMenu:layout() + UI.MenuBar.layout(self) local maxWidth = 1 for y,child in ipairs(self.children) do @@ -31,9 +31,12 @@ function UI.DropMenu:setParent() self.height = #self.children + 1 self.width = maxWidth + 2 - self.ow = self.width - self.canvas = self:addLayer() + if not self.canvas then + self.canvas = self:addLayer() + else + self.canvas:resize(self.width, self.height) + end end function UI.DropMenu:enable() diff --git a/sys/apps/network/proxy.lua b/sys/apps/network/proxy.lua index 7e0f284..5105103 100644 --- a/sys/apps/network/proxy.lua +++ b/sys/apps/network/proxy.lua @@ -15,8 +15,8 @@ local function getProxy(path) end Event.addRoutine(function() + print('proxy: listening on port 188') while true do - print('proxy: listening on port 188') local socket = Socket.server(188) print('proxy: connection from ' .. socket.dhost)