From 08bbce93f676b321ca09d3789146ab169978b4d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gianguido=20Sor=C3=A0?= Date: Wed, 13 Apr 2022 15:48:46 +0200 Subject: [PATCH] modal: add method to return a vec of payloads content() automatically filters out non-dirty items --- services/gam/src/modal/textentry.rs | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/services/gam/src/modal/textentry.rs b/services/gam/src/modal/textentry.rs index 8970d710e..2b4ad2267 100644 --- a/services/gam/src/modal/textentry.rs +++ b/services/gam/src/modal/textentry.rs @@ -12,13 +12,22 @@ const MAX_FIELDS: i16 = 10; pub type ValidatorErr = xous_ipc::String::<256>; +pub type Payloads = [TextEntryPayload; MAX_FIELDS as usize]; + #[derive(Debug, rkyv::Archive, rkyv::Serialize, rkyv::Deserialize, Copy, Clone, Eq, PartialEq, Default)] -pub struct TextEntryPayloads ([TextEntryPayload; MAX_FIELDS as usize]); +pub struct TextEntryPayloads (Payloads); impl TextEntryPayloads { pub fn first(&self) -> TextEntryPayload { self.0[0] } + + pub fn content(&self) -> Vec { + self.0 + .iter().cloned() + .filter(|payload| payload.dirty) + .collect() + } } #[derive(Debug, Copy, Clone, num_derive::FromPrimitive, num_derive::ToPrimitive)] @@ -434,6 +443,7 @@ impl ActionApi for TextEntry { _ => { payload.content.push(k).expect("ran out of space storing password"); log::trace!("****update payload: {}", payload.content); + payload.dirty = true; self.action_payloads[self.selected_field as usize] = payload; } }