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

Don't let chat move offscreen

Browse Source
This commit is contained in:
Syniis 2024-01-29 00:54:48 +01:00
parent 4d1d2e58da
commit 5b78e4eee4
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -244,6 +244,8 @@ impl<'a> Widget for Chat<'a> {
}
});
let maximum_chat_size = self.chat_size
+ Vec2::unit_y() * (CHAT_TAB_HEIGHT + CHAT_ICON_HEIGHT + CHAT_MARGIN_THICKNESS * 2.0);
let handle_chat_mouse_events = |chat_widget, ui: &mut UiCell, events: &mut Vec<Event>| {
let pos_delta: Vec2<f64> = ui
.widget_input(chat_widget)
@ -252,7 +254,11 @@ impl<'a> Widget for Chat<'a> {
.map(|drag| Vec2::<f64>::from(drag.delta_xy))
.sum();
if !pos_delta.is_approx_zero() {
let pos = self.chat_pos + pos_delta;
let pos = (self.chat_pos + pos_delta).map(|e| e.max(0.)).map3(
self.global_state.window.logical_size(),
maximum_chat_size,
|e, wsz, csz| e.min(wsz - csz),
);
events.push(Event::MoveChat(pos));
}
let size_delta: Vec2<f64> = ui
@ -262,10 +268,11 @@ impl<'a> Widget for Chat<'a> {
.map(|drag| Vec2::<f64>::from(drag.delta_xy))
.sum();
if !size_delta.is_approx_zero() {
let size = self.chat_size + size_delta;
let size = size.map3(MIN_DIMENSION, MAX_DIMENSION, |sz, min, max| {
sz.clamp(min, max)
});
let size = (self.chat_size + size_delta).map3(
MIN_DIMENSION,
MAX_DIMENSION,
|sz, min, max| sz.clamp(min, max),
);
events.push(Event::ResizeChat(size));
}
};