From 9d51bee3a5f0e64cf477487ab7acb6b035ecdbc5 Mon Sep 17 00:00:00 2001
From: Matt Johnston <matt@ucc.asn.au>
Date: Sun, 21 May 2023 00:36:29 +0800
Subject: [PATCH] Make the enter/exit callbacks run
---
embassy/demos/common/src/menu.rs | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/embassy/demos/common/src/menu.rs b/embassy/demos/common/src/menu.rs
index 31322fe..633f411 100644
--- a/embassy/demos/common/src/menu.rs
+++ b/embassy/demos/common/src/menu.rs
@@ -403,6 +403,9 @@ where
}
}
} else if cmd == "exit" && self.depth != 0 {
+ if let Some(cb_fn) = self.menus[self.depth].unwrap().exit {
+ cb_fn(&mut self.context);
+ }
self.menus[self.depth] = None;
self.depth -= 1;
} else {
@@ -423,6 +426,9 @@ where
ItemType::Menu(m) => {
self.depth += 1;
self.menus[self.depth] = Some(m);
+ if let Some(cb_fn) = m.entry {
+ cb_fn(&mut self.context);
+ }
}
ItemType::_Dummy => {
unreachable!();
--
GitLab