mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-17 08:40:52 +00:00
cleanup menu implementation warnings and shallow bugs
This commit is contained in:
parent
93547fa2cd
commit
564374dfd3
2 changed files with 6 additions and 6 deletions
|
|
@ -20,7 +20,7 @@ pub mod service;
|
||||||
#[cfg(all(feature = "std", any(feature = "board-baosec", feature = "hosted-baosec")))]
|
#[cfg(all(feature = "std", any(feature = "board-baosec", feature = "hosted-baosec")))]
|
||||||
use num_traits::*;
|
use num_traits::*;
|
||||||
#[cfg(all(feature = "std", any(feature = "board-baosec", feature = "hosted-baosec")))]
|
#[cfg(all(feature = "std", any(feature = "board-baosec", feature = "hosted-baosec")))]
|
||||||
use xous::{CID, Message, send_message};
|
use xous::Message;
|
||||||
#[cfg(all(feature = "std", any(feature = "board-baosec", feature = "hosted-baosec")))]
|
#[cfg(all(feature = "std", any(feature = "board-baosec", feature = "hosted-baosec")))]
|
||||||
use xous_ipc::Buffer;
|
use xous_ipc::Buffer;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,5 @@
|
||||||
use std::fmt::Write;
|
use std::fmt::Write;
|
||||||
|
|
||||||
use blitstr2::GlyphStyle;
|
|
||||||
use num_traits::*;
|
use num_traits::*;
|
||||||
use xous_ipc::Buffer;
|
use xous_ipc::Buffer;
|
||||||
|
|
||||||
|
|
@ -91,7 +90,8 @@ impl<'a> Menu<'a> {
|
||||||
pub fn new(name: &str, parent_conn: xous::CID, parent_redraw_op: usize) -> Menu<'_> {
|
pub fn new(name: &str, parent_conn: xous::CID, parent_redraw_op: usize) -> Menu<'_> {
|
||||||
let xns = xous_names::XousNames::new().unwrap();
|
let xns = xous_names::XousNames::new().unwrap();
|
||||||
let sid = xous::create_server().expect("can't create private menu message server");
|
let sid = xous::create_server().expect("can't create private menu message server");
|
||||||
let list = ScrollableList::default().set_alignment(crate::widgets::TextAlignment::Center);
|
let mut list = ScrollableList::default();
|
||||||
|
list.set_alignment(crate::widgets::TextAlignment::Center);
|
||||||
let mut title_tv = TextView::new(
|
let mut title_tv = TextView::new(
|
||||||
Gid::dummy(),
|
Gid::dummy(),
|
||||||
TextBounds::CenteredTop(Rectangle::new(
|
TextBounds::CenteredTop(Rectangle::new(
|
||||||
|
|
@ -214,8 +214,6 @@ impl<'a> Menu<'a> {
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
fn num_items(&self) -> usize { self.items.len() }
|
|
||||||
|
|
||||||
pub fn key_event(&mut self, keys: [char; 4]) {
|
pub fn key_event(&mut self, keys: [char; 4]) {
|
||||||
for &k in keys.iter() {
|
for &k in keys.iter() {
|
||||||
log::debug!("got key '{}'", k);
|
log::debug!("got key '{}'", k);
|
||||||
|
|
@ -299,7 +297,9 @@ impl MenuMatic {
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn delete_item(&self, item_name: &str) -> bool {
|
pub fn delete_item(&self, item_name: &str) -> bool {
|
||||||
let mm = MenuManagement { item: MenuItem::default(), op: MenuMgrOp::DeleteItem };
|
let mut item = MenuItem::default();
|
||||||
|
item.name = item_name.to_owned();
|
||||||
|
let mm = MenuManagement { item, op: MenuMgrOp::DeleteItem };
|
||||||
let mut buf = Buffer::into_buf(mm).expect("Couldn't convert to memory structure");
|
let mut buf = Buffer::into_buf(mm).expect("Couldn't convert to memory structure");
|
||||||
buf.lend_mut(self.cid, 0).expect("Couldn't issue management opcode");
|
buf.lend_mut(self.cid, 0).expect("Couldn't issue management opcode");
|
||||||
let ret = buf.to_original::<MenuManagement, _>().unwrap();
|
let ret = buf.to_original::<MenuManagement, _>().unwrap();
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue