MayaTheShy/Opus
1
0
Fork 0
Code Issues 4 Pull Requests Actions Packages Projects Releases Wiki Activity

Develop 1.8 #20

Merged
Kan18 merged 242 commits from develop-1.8 into master-1.8 2019-11-10 20:52:08 -05:00
Conversation 4 Commits 242 Files Changed 193 +8 -5
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit e6d1e58ce2 - Show all commits

9
sys/apis/ui/components/DropMenu.lua
View File

@@ -10,8 +10,8 @@ UI.DropMenu.defaults = {
backgroundColor = colors.white, backgroundColor = colors.white,
buttonClass = 'DropMenuItem', buttonClass = 'DropMenuItem',
} }
function UI.DropMenu:setParent() function UI.DropMenu:layout()
UI.MenuBar.setParent(self) UI.MenuBar.layout(self)
local maxWidth = 1 local maxWidth = 1
for y,child in ipairs(self.children) do for y,child in ipairs(self.children) do
@@ -31,9 +31,12 @@ function UI.DropMenu:setParent()
self.height = #self.children + 1 self.height = #self.children + 1
self.width = maxWidth + 2 self.width = maxWidth + 2
self.ow = self.width
if not self.canvas then
self.canvas = self:addLayer() self.canvas = self:addLayer()
else
self.canvas:resize(self.width, self.height)
end
end end
function UI.DropMenu:enable() function UI.DropMenu:enable()

2
sys/apps/network/proxy.lua
View File

@@ -15,8 +15,8 @@ local function getProxy(path)
end end
Event.addRoutine(function() Event.addRoutine(function()
while true do
print('proxy: listening on port 188') print('proxy: listening on port 188')
while true do
local socket = Socket.server(188) local socket = Socket.server(188)
print('proxy: connection from ' .. socket.dhost) print('proxy: connection from ' .. socket.dhost)