overspend1/PathOfBuilding
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sneaking in a few more features

Browse Source 
- Sort button for 'All items' list
- Improved keyboard interaction
This commit is contained in:
Openarl
2016-11-21 02:54:19 +10:00
parent 5b0bc604ad
commit 867df49074
14 changed files with 161 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Modules/Build.lua
View File

@@ -95,9 +95,8 @@ function buildMode:Init(dbFileName, buildName)
common.New("ButtonControl", nil, 45, 70, 80, 20, "Cancel", function()
main:ClosePopup()
end),
})
}, "save", "edit")
popup.controls.save.enabled = false
popup:SelectControl(popup.controls.edit)
end)
-- Controls: top bar, right side

16
Modules/Main.lua
View File

@@ -369,8 +369,8 @@ function main:DrawCheckMark(x, y, size)
DrawImageQuad(nil, x + size * 0.40, y + size * 0.90, x + size * 0.35, y + size * 0.75, x + size * 0.80, y + size * 0.10, x + size * 0.90, y + size * 0.20)
end
function main:OpenPopup(width, height, title, controls)
local popup = common.New("PopupDialog", width, height, title, controls)
function main:OpenPopup(width, height, title, controls, enterControl, defaultControl)
local popup = common.New("PopupDialog", width, height, title, controls, enterControl, defaultControl)
t_insert(self.popups, popup)
return popup
end
@@ -386,10 +386,10 @@ function main:OpenMessagePopup(title, msg)
t_insert(controls, common.New("LabelControl", nil, 0, 20 + numMsgLines * 16, 0, 16, line))
numMsgLines = numMsgLines + 1
end
t_insert(controls, common.New("ButtonControl", nil, 0, 40 + numMsgLines * 16, 80, 20, "Ok", function()
controls.close = common.New("ButtonControl", nil, 0, 40 + numMsgLines * 16, 80, 20, "Ok", function()
main:ClosePopup()
end))
return self:OpenPopup(m_max(DrawStringWidth(16, "VAR", msg) + 30, 190), 70 + numMsgLines * 16, title, controls)
end)
return self:OpenPopup(m_max(DrawStringWidth(16, "VAR", msg) + 30, 190), 70 + numMsgLines * 16, title, controls, "close")
end
function main:OpenConfirmPopup(title, msg, confirmLabel, onConfirm)
@@ -399,14 +399,14 @@ function main:OpenConfirmPopup(title, msg, confirmLabel, onConfirm)
t_insert(controls, common.New("LabelControl", nil, 0, 20 + numMsgLines * 16, 0, 16, line))
numMsgLines = numMsgLines + 1
end
t_insert(controls, common.New("ButtonControl", nil, -45, 40 + numMsgLines * 16, 80, 20, confirmLabel, function()
controls.confirm = common.New("ButtonControl", nil, -45, 40 + numMsgLines * 16, 80, 20, confirmLabel, function()
onConfirm()
main:ClosePopup()
end))
end)
t_insert(controls, common.New("ButtonControl", nil, 45, 40 + numMsgLines * 16, 80, 20, "Cancel", function()
main:ClosePopup()
end))
return self:OpenPopup(m_max(DrawStringWidth(16, "VAR", msg) + 30, 190), 70 + numMsgLines * 16, title, controls)
return self:OpenPopup(m_max(DrawStringWidth(16, "VAR", msg) + 30, 190), 70 + numMsgLines * 16, title, controls, "confirm")
end
function main:AddTooltipLine(size, text)