From 3f0648dc3d4390b91d5ac3cbf01d7932898af14e Mon Sep 17 00:00:00 2001 From: Bel LaPointe Date: Thu, 23 Mar 2023 11:03:23 -0600 Subject: [PATCH] gui shows current button to push --- src/gui.rs | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/gui.rs b/src/gui.rs index 9887bcb..485a23c 100644 --- a/src/gui.rs +++ b/src/gui.rs @@ -68,8 +68,8 @@ enum Message { R, } -fn controller_button_to_string(msg: Message) -> String { - return format!("{:?}", msg); +fn controller_button_to_string(btn: Message, cur: iced::keyboard::KeyCode) -> String { + return format!("{:?} => {:?}", cur, btn); } impl Application for Main { @@ -176,16 +176,16 @@ impl Application for Main { fn view(&self) -> Element { return column![ - button(text(controller_button_to_string(Message::Up))).on_press(Message::Up), - button(text(controller_button_to_string(Message::Down))).on_press(Message::Down), - button(text(controller_button_to_string(Message::Left))).on_press(Message::Left), - button(text(controller_button_to_string(Message::Right))).on_press(Message::Right), - button(text(controller_button_to_string(Message::A))).on_press(Message::A), - button(text(controller_button_to_string(Message::B))).on_press(Message::B), - button(text(controller_button_to_string(Message::X))).on_press(Message::X), - button(text(controller_button_to_string(Message::Y))).on_press(Message::Y), - button(text(controller_button_to_string(Message::L))).on_press(Message::L), - button(text(controller_button_to_string(Message::R))).on_press(Message::R), + button(text(controller_button_to_string(Message::Up, self.inputs.stick.up))).on_press(Message::Up), + button(text(controller_button_to_string(Message::Down, self.inputs.stick.down))).on_press(Message::Down), + button(text(controller_button_to_string(Message::Left, self.inputs.stick.left))).on_press(Message::Left), + button(text(controller_button_to_string(Message::Right, self.inputs.stick.right))).on_press(Message::Right), + button(text(controller_button_to_string(Message::A, self.inputs.a))).on_press(Message::A), + button(text(controller_button_to_string(Message::B, self.inputs.b))).on_press(Message::B), + button(text(controller_button_to_string(Message::X, self.inputs.x))).on_press(Message::X), + button(text(controller_button_to_string(Message::Y, self.inputs.y))).on_press(Message::Y), + button(text(controller_button_to_string(Message::L, self.inputs.l))).on_press(Message::L), + button(text(controller_button_to_string(Message::R, self.inputs.r))).on_press(Message::R), text(self.ntfy.clone()).size(50), ] .padding(20)