From 478adaf9c00557eb14fee23a024a192e572e1f2e Mon Sep 17 00:00:00 2001 From: ruki Date: Tue, 23 Jan 2018 22:35:32 +0800 Subject: load menu config first --- tests/ui/mconfdialog.lua | 4 +++- xmake/core/ui/mconfdialog.lua | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) 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 includes, excludes. Enter 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 -- cgit v1.3.1