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

Cleaner logic, fixed bug preventing chat from being scrolled

Browse Source
This commit is contained in:
Syniis 2024-02-23 22:18:06 +01:00
parent 4caebcf4a3
commit c3e533d7f1
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -326,10 +326,6 @@ impl<'a> Widget for Chat<'a> {
} }
} }
if force_chat {
ui.scroll_widget(state.ids.message_box, [0.0, f64::MAX]);
}
// Trigger scroll event queued from previous frame // Trigger scroll event queued from previous frame
if state.scroll_next { if state.scroll_next {
ui.scroll_widget(state.ids.message_box, [0.0, f64::MAX]); ui.scroll_widget(state.ids.message_box, [0.0, f64::MAX]);
@ -811,6 +807,8 @@ impl<'a> Widget for Chat<'a> {
let has_message = !state.input.message.is_empty(); let has_message = !state.input.message.is_empty();
let pressed = matches!(key_press.key, Key::Return | Key::NumPadEnter); let pressed = matches!(key_press.key, Key::Return | Key::NumPadEnter);
if pressed { if pressed {
// If chat was hidden, scroll to bottom the next time it is opened
state.update(|s| s.scroll_next = force_chat);
events.push(Event::DisableForceChat); events.push(Event::DisableForceChat);
} }
has_message && pressed has_message && pressed