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

Improvements to popupmenus, fix #245 and #246

Browse Source
This commit is contained in:
Eduardo Bart
2013-01-26 16:05:34 -02:00
parent 835adfb4ce
commit 7e01306fc6
4 changed files with 51 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
modules/corelib/ui/uipopupmenu.lua
View File

@@ -33,11 +33,23 @@ function UIPopupMenu:display(pos)
currentMenu = self
end
function UIPopupMenu:onGeometryChange()
function UIPopupMenu:onGeometryChange(oldRect, newRect)
local parent = self:getParent()
if not parent then return end
local ymax = parent:getY() + parent:getHeight()
local xmax = parent:getX() + parent:getWidth()
if newRect.y + newRect.height > ymax then
local newy = newRect.y - newRect.height
if newy > 0 and newy + newRect.height < ymax then self:setY(newy) end
end
if newRect.x + newRect.width > xmax then
local newx = newRect.x - newRect.width
if newx > 0 and newx + newRect.width < xmax then self:setX(newx) end
end
self:bindRectToParent()
end
function UIPopupMenu:addOption(optionName, optionCallback)
function UIPopupMenu:addOption(optionName, optionCallback, shortcut)
local optionWidget = g_ui.createWidget(self:getStyleName() .. 'Button', self)
local lastOptionWidget = self:getLastChild()
optionWidget.onClick = function(self)
@@ -46,6 +58,13 @@ function UIPopupMenu:addOption(optionName, optionCallback)
end
optionWidget:setText(optionName)
local width = optionWidget:getTextSize().width + optionWidget:getMarginLeft() + optionWidget:getMarginRight() + 15
if shortcut then
local shortcutLabel = g_ui.createWidget(self:getStyleName() .. 'ShortcutLabel', optionWidget)
shortcutLabel:setText(shortcut)
width = width + shortcutLabel:getTextSize().width + shortcutLabel:getMarginLeft() + shortcutLabel:getMarginRight()
end
self:setWidth(math.max(self:getWidth(), width))
end