Digitalstack/otclient
2
0
Fork 0
mirror of https://github.com/edubart/otclient.git synced 2025-10-17 21:13:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix issue #21, but miniwindows can be a lot smarter

Browse Source
This commit is contained in:
Henrique Santiago
2012-08-21 02:35:08 -03:00
parent c185e709b3
commit 2142ee765d
10 changed files with 57 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
modules/corelib/ui/uiminiwindowcontainer.lua
View File

@@ -21,19 +21,31 @@ function UIMiniWindowContainer:fitAll(noRemoveChild)
local sumHeight = 0
local children = self:getChildren()
for i=1,#children do
sumHeight = sumHeight + children[i]:getHeight()
if children[i]:isVisible() then
sumHeight = sumHeight + children[i]:getHeight()
end
end
local selfHeight = self:getHeight()
local selfHeight = self:getHeight() - (self:getMarginTop() + self:getMarginBottom() + self:getPaddingTop() + self:getPaddingBottom())
if sumHeight <= selfHeight then
return
end
local removeChildren = {}
-- try to resize noRemoveChild
local maximumHeight = selfHeight - (sumHeight - noRemoveChild:getHeight())
if noRemoveChild:getMinimumHeight() <= maximumHeight then
sumHeight = sumHeight - noRemoveChild:getHeight() + maximumHeight
addEvent(function() noRemoveChild:setHeight(maximumHeight) end)
end
-- TODO: try to resize another widget?
-- TODO: try to find another panel?
-- try to remove no-save widget
for i=#children,1,-1 do
if sumHeight < selfHeight then
if sumHeight <= selfHeight then
break
end
@@ -47,7 +59,7 @@ function UIMiniWindowContainer:fitAll(noRemoveChild)
-- try to remove save widget
for i=#children,1,-1 do
if sumHeight < selfHeight then
if sumHeight <= selfHeight then
break
end
@@ -63,11 +75,6 @@ function UIMiniWindowContainer:fitAll(noRemoveChild)
for i=1,#removeChildren do
removeChildren[i]:close()
end
-- dont let noRemoveChild be bigger than self
if noRemoveChild:getHeight() > selfHeight - 20 then
noRemoveChild:setHeight(selfHeight - 20)
end
end
function UIMiniWindowContainer:onDrop(widget, mousePos)
@@ -88,6 +95,7 @@ function UIMiniWindowContainer:onDrop(widget, mousePos)
self:addChild(widget)
end
self:fitAll(widget)
return true
end
end
@@ -114,7 +122,9 @@ function UIMiniWindowContainer:scheduleInsert(widget, index)
else
local oldParent = widget:getParent()
if oldParent ~= self then
oldParent:removeChild(widget)
if oldParent then
oldParent:removeChild(widget)
end
self:insertChild(index, widget)
while true do