summaryrefslogtreecommitdiff
path: root/xmake/core/ui/menuconf.lua
diff options
context:
space:
mode:
authorruki <[email protected]>2018-01-26 22:40:25 +0800
committerruki <[email protected]>2018-01-26 10:02:35 +0800
commitb58b0d43b32aae6f084659fc80aeb048e95df71e (patch)
treeec32e3144b324b3da1e6b34e92e0eeb00b783e90 /xmake/core/ui/menuconf.lua
parent19e82986fb67b09726905788b53c8ad8ad05c263 (diff)
modify choice value
Diffstat (limited to 'xmake/core/ui/menuconf.lua')
-rw-r--r--xmake/core/ui/menuconf.lua8
1 files changed, 4 insertions, 4 deletions
diff --git a/xmake/core/ui/menuconf.lua b/xmake/core/ui/menuconf.lua
index 370f59247..50395452c 100644
--- a/xmake/core/ui/menuconf.lua
+++ b/xmake/core/ui/menuconf.lua
@@ -142,8 +142,8 @@ end
-- string config
-- - {name = "...", kind = "string", value = "xmake", default = "", description = "string config item", new = true/false}
--
--- choice config
--- - {name = "...", kind = "choice", value = "...", default = "...", description = "choice config item", values = {1, 2, 3, 4, 5}}
+-- choice config (value is index)
+-- - {name = "...", kind = "choice", value = 1, default = 1, description = "choice config item", values = {2, 2, 3, 4, 5}}
--
-- menu config
-- - {name = "...", kind = "menu", description = "menu config item", configs = {...}}
@@ -200,7 +200,7 @@ function config:__tostring()
elseif self.kind == "string" or (not self.kind and type(value) == "string") then -- string config?
text = "(" .. tostring(value or "") .. ") " .. text
elseif self.kind == "choice" then -- choice config?
- text = " " .. text .. " (" .. tostring(value or "") .. ")" .. " --->"
+ text = " " .. text .. " (" .. tostring(self.values[value or 1]) .. ")" .. " --->"
elseif self.kind == "menu" then -- menu config?
text = " " .. text .. " --->"
end
@@ -219,7 +219,7 @@ menuconf.config = menuconf.config or config
menuconf.menu = menuconf.menu or config { kind = "menu", configs = {} }
menuconf.number = menuconf.number or config { kind = "number", default = 0 }
menuconf.string = menuconf.string or config { kind = "string", default = "" }
-menuconf.choice = menuconf.choice or config { kind = "choice", values = {} }
+menuconf.choice = menuconf.choice or config { kind = "choice", default = 1, values = {} }
menuconf.boolean = menuconf.boolean or config { kind = "boolean", default = false }
-- return module