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

Attempt to fix ui bug with changing screens causing inventory slots and such to disappear, presumably due to dpi differences

Browse Source
This commit is contained in:
Imbris 2020-11-22 04:05:37 -05:00
parent 1355c1e8f5
commit 7ba2efcde2
2 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
voxygen/src/hud/mod.rs
View File

@ -2471,6 +2471,10 @@ impl Hud {
}
true
},
WinEvent::ScaleFactorChanged(scale_factor) => {
self.ui.scale_factor_changed(scale_factor);
false
},
WinEvent::InputUpdate(GameInput::ToggleInterface, true) if !self.typing() => {
self.show.toggle_ui();
true

24
voxygen/src/ui/mod.rs
View File

@ -115,6 +115,8 @@ pub struct Ui {
ingame_locals: Vec<Consts<UiLocals>>,
// Window size for updating scaling
window_resized: Option<Vec2<f64>>,
// Scale factor changed
scale_factor_changed: Option<f64>,
// Used to delay cache resizing until after current frame is drawn
need_cache_resize: bool,
// Scaling of the ui
@ -153,6 +155,7 @@ impl Ui {
default_globals: renderer.create_consts(&[Globals::default()])?,
ingame_locals: Vec::new(),
window_resized: None,
scale_factor_changed: None,
need_cache_resize: false,
scale,
tooltip_manager,
@ -169,6 +172,10 @@ impl Ui {
self.ui.handle_event(Input::Resize(w, h));
}
pub fn scale_factor_changed(&mut self, scale_factor: f64) {
self.scale_factor_changed = Some(scale_factor);
}
// Get a copy of Scale
pub fn scale(&self) -> Scale { self.scale }
@ -284,8 +291,15 @@ impl Ui {
self.tooltip_manager
.maintain(self.ui.global_input(), self.scale.scale_factor_logical());
// Handle scale factor changing
let need_resize = if let Some(scale_factor) = self.scale_factor_changed.take() {
self.scale.scale_factor_changed(scale_factor)
} else {
false
};
// Handle window resizing.
if let Some(new_dims) = self.window_resized.take() {
let need_resize = if let Some(new_dims) = self.window_resized.take() {
let (old_w, old_h) = self.scale.scaled_resolution().into_tuple();
self.scale.window_resized(new_dims);
let (w, h) = self.scale.scaled_resolution().into_tuple();
@ -296,7 +310,13 @@ impl Ui {
// Somewhat inefficient for elements that won't change size after a window
// resize
let res = renderer.get_resolution();
self.need_cache_resize = res.x > 0 && res.y > 0 && !(old_w == w && old_h == h);
res.x > 0 && res.y > 0 && !(old_w == w && old_h == h)
} else {
false
} || need_resize;
if need_resize {
self.need_cache_resize = true;
}
if self.need_cache_resize {