diff --git a/crates/fj-viewer/src/screen.rs b/crates/fj-viewer/src/screen.rs index 0eae41ddb..83805102c 100644 --- a/crates/fj-viewer/src/screen.rs +++ b/crates/fj-viewer/src/screen.rs @@ -9,9 +9,6 @@ pub trait Screen { /// The window type Window: HasDisplayHandle + HasWindowHandle + Send + Sync + 'static; - /// Access the size of the screen - fn size(&self) -> ScreenSize; - /// Access the window fn window(&self) -> Arc; } diff --git a/crates/fj-viewer/src/viewer.rs b/crates/fj-viewer/src/viewer.rs index be8def7c9..131b07dce 100644 --- a/crates/fj-viewer/src/viewer.rs +++ b/crates/fj-viewer/src/viewer.rs @@ -10,7 +10,7 @@ use crate::{ CameraTuningConfig, DEFAULT_CAMERA_TUNING_CONFIG, InputEvent, MouseButton, }, - screen::{NormalizedScreenPosition, Screen, ScreenSize}, + screen::{NormalizedScreenPosition, ScreenSize}, window::Window, }; diff --git a/crates/fj-viewer/src/window.rs b/crates/fj-viewer/src/window.rs index 53403e18e..869f4df44 100644 --- a/crates/fj-viewer/src/window.rs +++ b/crates/fj-viewer/src/window.rs @@ -44,12 +44,8 @@ impl Window { inner: Arc::new(window), }) } -} -impl Screen for Window { - type Window = winit::window::Window; - - fn size(&self) -> ScreenSize { + pub fn size(&self) -> ScreenSize { let size = self.inner.inner_size(); ScreenSize { @@ -57,6 +53,10 @@ impl Screen for Window { height: size.height, } } +} + +impl Screen for Window { + type Window = winit::window::Window; fn window(&self) -> Arc { self.inner.clone()