1 files changed, 4 insertions(+), 2 deletions(-)

M crates/client/src/ui/mod.rs

@@ 119,12 119,14 @@ pub fn draw_chat(ctx: &egui::Context, world: &mut World, send_packet_events: &mu
                         });
                 });
             ui.horizontal(|ui| {
-                egui::TextEdit::singleline(&mut chat.textbox).show(ui);
-                if ui.button("Send").clicked() {
+                let output = egui::TextEdit::singleline(&mut chat.textbox).show(ui);
+                if ui.button("Send").clicked() ||
+                    (ctx.input(|i| i.key_pressed(egui::Key::Enter)) && output.response.lost_focus()) {
                     send_packet_events.send(SendPacket(Packet::SendMessage {
                         target: None,
                         content: chat.textbox.clone(),
                     }));
+                    chat.textbox.clear();
                 }
             });
         });