summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2018-01-23 22:35:32 +0800
committerruki <[email protected]>2018-01-23 09:33:16 +0800
commit478adaf9c00557eb14fee23a024a192e572e1f2e (patch)
treed4501c2a839b20efe8dcbd142e888bdab4461f15
parent98f8f5d64a469fd727831a24776a7a69358f5768 (diff)
load menu config first
-rw-r--r--tests/ui/mconfdialog.lua4
-rw-r--r--xmake/core/ui/mconfdialog.lua3
2 files changed, 6 insertions, 1 deletions
diff --git a/tests/ui/mconfdialog.lua b/tests/ui/mconfdialog.lua
index 5a52047e5..d0b5bf75b 100644
--- a/tests/ui/mconfdialog.lua
+++ b/tests/ui/mconfdialog.lua
@@ -46,7 +46,9 @@ function demo:init()
-- init menu config dialog
local mconfdialog = mconfdialog:new("mconfdialog.main", rect {1, 1, self:width() - 1, self:height() - 1}, "menu config")
- mconfdialog:action_set(action.ac_on_exit, function (v, e) self:quit() end)
+ mconfdialog:action_set(action.ac_on_exit, function (v) self:quit() end)
+ mconfdialog:action_set(action.ac_on_load, function (v) log:print("load") end)
+ mconfdialog:action_set(action.ac_on_save, function (v) log:print("save") end)
self:insert(mconfdialog)
end
diff --git a/xmake/core/ui/mconfdialog.lua b/xmake/core/ui/mconfdialog.lua
index 8062cbe14..dd12398fa 100644
--- a/xmake/core/ui/mconfdialog.lua
+++ b/xmake/core/ui/mconfdialog.lua
@@ -56,6 +56,9 @@ Pressing <Y> includes, <N> excludes. Enter <Esc> to go back or exit, <?> for Hel
-- insert menu config
self:box():panel():insert(self:menuconf())
+
+ -- load config first
+ self:action_on(action.ac_on_load)
end
-- get menu config