diff --git a/services/gam/src/modal/notification.rs b/services/gam/src/modal/notification.rs index 9781d46a6..077ff1f3e 100644 --- a/services/gam/src/modal/notification.rs +++ b/services/gam/src/modal/notification.rs @@ -164,26 +164,25 @@ impl ActionApi for Notification { if self.qrwidth > 0 { self.draw_qrcode(at_height, modal); } - - // divider lines - let color = if self.is_password { - PixelColor::Light - } else { - PixelColor::Dark - }; - - modal - .gam - .draw_line( - modal.canvas, - Line::new_with_style( - Point::new(modal.margin, at_height + modal.margin), - Point::new(modal.canvas_width - modal.margin, at_height + modal.margin), - DrawStyle::new(color, color, 1), - ), - ) - .expect("couldn't draw entry line"); } + // divider lines + let color = if self.is_password { + PixelColor::Light + } else { + PixelColor::Dark + }; + + modal + .gam + .draw_line( + modal.canvas, + Line::new_with_style( + Point::new(modal.margin, at_height + modal.margin), + Point::new(modal.canvas_width - modal.margin, at_height + modal.margin), + DrawStyle::new(color, color, 1), + ), + ) + .expect("couldn't draw entry line"); } fn key_action(&mut self, k: char) -> (Option, bool) { log::trace!("key_action: {}", k); @@ -192,12 +191,12 @@ impl ActionApi for Notification { // ignore null messages } _ => { + send_message( + self.action_conn, + xous::Message::new_scalar(self.action_opcode as usize, k as u32 as usize, 0, 0, 0), + ) + .expect("couldn't pass on dismissal"); if self.manual_dismiss { - send_message( - self.action_conn, - xous::Message::new_scalar(self.action_opcode as usize, k as u32 as usize, 0, 0, 0), - ) - .expect("couldn't pass on dismissal"); return (None, true); } } diff --git a/services/modals/src/main.rs b/services/modals/src/main.rs index 5fdf4d151..07298efee 100644 --- a/services/modals/src/main.rs +++ b/services/modals/src/main.rs @@ -536,7 +536,7 @@ fn main() -> ! { renderer_cid, Opcode::HandleDynamicNotificationKeyhit.to_u32().unwrap(), ); - gutter.set_manual_dismiss(true); + gutter.set_manual_dismiss(false); renderer_modal.modify( Some(ActionType::Notification(gutter)), Some(&top_text), @@ -587,6 +587,7 @@ fn main() -> ! { None, ); renderer_modal.redraw(); + xous::yield_slice(); } _ => { log::error!("UX return opcode does not match our current operation in flight. This is a serious internal error."); @@ -599,7 +600,7 @@ fn main() -> ! { token_lock = next_lock(&mut work_queue); }, Some(Opcode::HandleDynamicNotificationKeyhit) => msg_scalar_unpack!(msg, k, _, _, _, { - log::info!("Dynamic kbd hit: {}({})", k, char::from_u32(k as u32).unwrap_or(' ')); + log::debug!("Dynamic kbd hit: {}({})", k, char::from_u32(k as u32).unwrap_or(' ')); if let Some(sender) = dynamic_notification_listener.take() { xous::return_scalar2(sender, 1, k).unwrap(); }