Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove chat message echoing by ui

Browse Source 
Former-commit-id: f97358f3bdb39048ed705abff17cbd4c949dbaf3
This commit is contained in:
Imbris 2019-03-21 23:55:52 -04:00
parent fdb0512069
commit aef3179448
1 changed files with 16 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
voxygen/src/hud/chat.rs
View File

@ -54,27 +54,6 @@ impl Chat {
} }
} }
pub fn update_layout(&mut self, ui_widgets: &mut UiCell) -> Option<String> { pub fn update_layout(&mut self, ui_widgets: &mut UiCell) -> Option<String> {
// If enter is pressed send the current message
let new_msg = if ui_widgets
.widget_input(self.ids.input)
.presses()
.key()
.any(|key_press| match key_press.key {
Key::Return => true,
_ => false,
})
{
let new_message = self.input.clone();
self.input.clear();
self.new_message(new_message.clone());
// Scroll to the bottom
// TODO: uncomment when we can actually get chat messages from other people
//ui_widgets.scroll_widget(self.ids.message_box, [0.0, std::f64::MAX]);
Some(new_message)
} else {
None
};
// Maintain scrolling // Maintain scrolling
if self.new_messages { if self.new_messages {
self.scroll_new_messages(ui_widgets); self.scroll_new_messages(ui_widgets);
@ -127,6 +106,21 @@ impl Chat {
s.set(ui_widgets) s.set(ui_widgets)
} }
new_msg // If enter is pressed send the current message
if ui_widgets
.widget_input(self.ids.input)
.presses()
.key()
.any(|key_press| match key_press.key {
Key::Return => true,
_ => false,
})
{
let new_message = self.input.clone();
self.input.clear();
Some(new_message)
} else {
None
}
} }
} }