Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
31bdb6d92e | ||
|
|
83f4ee0e51 | ||
|
|
ed1d2b5835 |
18
src/gui.rs
18
src/gui.rs
@@ -29,7 +29,7 @@ pub fn main(cfg: GUI, output_stream: Box<dyn OutputStream>) -> iced::Result {
|
|||||||
text_multithreading: def.text_multithreading,
|
text_multithreading: def.text_multithreading,
|
||||||
try_opengles_first: def.try_opengles_first,
|
try_opengles_first: def.try_opengles_first,
|
||||||
window: iced::window::Settings{
|
window: iced::window::Settings{
|
||||||
size: (300, 720),
|
size: (300, 900),
|
||||||
position: iced::window::Position::Specific(0, 0),
|
position: iced::window::Position::Specific(0, 0),
|
||||||
..iced::window::Settings::default()
|
..iced::window::Settings::default()
|
||||||
},
|
},
|
||||||
@@ -145,7 +145,9 @@ impl Main {
|
|||||||
match self.feedback_recv_c.try_recv() {
|
match self.feedback_recv_c.try_recv() {
|
||||||
Ok(msg) => {
|
Ok(msg) => {
|
||||||
match msg {
|
match msg {
|
||||||
Feedback::Heard(msg) => self.ntfy_from_server = msg,
|
Feedback::Heard(msg) => {
|
||||||
|
self.ntfy_from_server = msg;
|
||||||
|
},
|
||||||
_ => break,
|
_ => break,
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
@@ -362,7 +364,7 @@ impl Application for Main {
|
|||||||
},
|
},
|
||||||
_ => None,
|
_ => None,
|
||||||
}),
|
}),
|
||||||
every(std::time::Duration::from_millis(5000)).map(|_| Message::Tick),
|
every(std::time::Duration::from_millis(2000)).map(|_| Message::Tick),
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -374,17 +376,23 @@ impl Application for Main {
|
|||||||
column![
|
column![
|
||||||
text(String::from("Button Mapping")).size(24),
|
text(String::from("Button Mapping")).size(24),
|
||||||
text(String::from("--------------")).size(24),
|
text(String::from("--------------")).size(24),
|
||||||
|
row![
|
||||||
|
column![
|
||||||
new_cfg_button(Message::Up, self.inputs.stick.up),
|
new_cfg_button(Message::Up, self.inputs.stick.up),
|
||||||
new_cfg_button(Message::Down, self.inputs.stick.down),
|
new_cfg_button(Message::Down, self.inputs.stick.down),
|
||||||
new_cfg_button(Message::Left, self.inputs.stick.left),
|
new_cfg_button(Message::Left, self.inputs.stick.left),
|
||||||
new_cfg_button(Message::Right, self.inputs.stick.right),
|
new_cfg_button(Message::Right, self.inputs.stick.right),
|
||||||
|
new_cfg_button(Message::Start, self.inputs.start),
|
||||||
|
].padding(5).align_items(Alignment::Center),
|
||||||
|
column![
|
||||||
new_cfg_button(Message::A, self.inputs.a),
|
new_cfg_button(Message::A, self.inputs.a),
|
||||||
new_cfg_button(Message::B, self.inputs.b),
|
new_cfg_button(Message::B, self.inputs.b),
|
||||||
new_cfg_button(Message::X, self.inputs.x),
|
new_cfg_button(Message::X, self.inputs.x),
|
||||||
new_cfg_button(Message::Y, self.inputs.y),
|
new_cfg_button(Message::Y, self.inputs.y),
|
||||||
new_cfg_button(Message::Start, self.inputs.start),
|
|
||||||
new_cfg_button(Message::L, self.inputs.l),
|
new_cfg_button(Message::L, self.inputs.l),
|
||||||
new_cfg_button(Message::R, self.inputs.r),
|
new_cfg_button(Message::R, self.inputs.r),
|
||||||
|
].padding(5).align_items(Alignment::Center),
|
||||||
|
].padding(5).align_items(Alignment::Center),
|
||||||
text(String::from("--------------")).size(24),
|
text(String::from("--------------")).size(24),
|
||||||
text(self.ntfy_from_client.clone()).size(18),
|
text(self.ntfy_from_client.clone()).size(18),
|
||||||
].padding(20).align_items(Alignment::Center),
|
].padding(20).align_items(Alignment::Center),
|
||||||
@@ -398,7 +406,7 @@ impl Application for Main {
|
|||||||
button(text("Say")).on_press(Message::InputTextEntrySubmitSay).padding(20),
|
button(text("Say")).on_press(Message::InputTextEntrySubmitSay).padding(20),
|
||||||
button(text("Send")).on_press(Message::InputTextEntrySubmitSend).padding(20),
|
button(text("Send")).on_press(Message::InputTextEntrySubmitSend).padding(20),
|
||||||
].padding(20).align_items(Alignment::Center),
|
].padding(20).align_items(Alignment::Center),
|
||||||
text(self.ntfy_from_server.clone()).size(18),
|
text(self.ntfy_from_server.clone().trim()).size(18),
|
||||||
].padding(20).align_items(Alignment::Center),
|
].padding(20).align_items(Alignment::Center),
|
||||||
].padding(0).align_items(Alignment::Center),
|
].padding(0).align_items(Alignment::Center),
|
||||||
].padding(0).align_items(Alignment::Center).into();
|
].padding(0).align_items(Alignment::Center).into();
|
||||||
|
|||||||
Reference in New Issue
Block a user