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

fix Window::logical_size

Browse Source
This commit is contained in:
Imbris 2020-02-20 18:41:51 -05:00
parent 70eba0c30a
commit 5e8d74e00e
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
voxygen/src/ui/scale.rs
View File

@ -19,7 +19,7 @@ pub enum ScaleMode {
pub struct Scale {
mode: ScaleMode,
// Current dpi factor
dpi_factor: f64,
scale_factor: f64,
// Current logical window size
window_dims: Vec2<f64>,
}
@ -27,10 +27,10 @@ pub struct Scale {
impl Scale {
pub fn new(window: &Window, mode: ScaleMode) -> Self {
let window_dims = window.logical_size();
let dpi_factor = window.renderer().get_resolution().x as f64 / window_dims.x;
let scale_factor = window.renderer().get_resolution().x as f64 / window_dims.x;
Scale {
mode,
dpi_factor,
scale_factor,
window_dims,
}
}
@ -54,7 +54,7 @@ impl Scale {
// coordinates.
pub fn scale_factor_logical(&self) -> f64 {
match self.mode {
ScaleMode::Absolute(scale) => scale / self.dpi_factor,
ScaleMode::Absolute(scale) => scale / self.scale_factor,
ScaleMode::DpiFactor => 1.0,
ScaleMode::RelativeToWindow(dims) => {
(self.window_dims.x / dims.x).min(self.window_dims.y / dims.y)
@ -64,11 +64,11 @@ impl Scale {
// Calculate factor to transform between physical coordinates and our scaled
// coordinates.
pub fn scale_factor_physical(&self) -> f64 { self.scale_factor_logical() * self.dpi_factor }
pub fn scale_factor_physical(&self) -> f64 { self.scale_factor_logical() * self.scale_factor }
// Updates internal window size (and/or dpi_factor).
// Updates internal window size (and/or scale_factor).
pub fn window_resized(&mut self, new_dims: Vec2<f64>, renderer: &Renderer) {
self.dpi_factor = renderer.get_resolution().x as f64 / new_dims.x;
self.scale_factor = renderer.get_resolution().x as f64 / new_dims.x;
self.window_dims = new_dims;
}

7
voxygen/src/window.rs
View File

@ -1031,7 +1031,12 @@ impl Window {
#[allow(clippy::or_fun_call)] // TODO: Pending review in #587
pub fn logical_size(&self) -> Vec2<f64> {
let (w, h) = self.window.window().inner_size().into();
let (w, h) = self
.window
.window()
.inner_size()
.to_logical::<f64>(self.window.window().scale_factor())
.into();
Vec2::new(w, h)
}