From 93bfe2c75ec97ef78f993926c703f040dde4a5f3 Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Sat, 30 Apr 2022 13:37:57 +0200 Subject: Expose `system` module through feature flag --- winit/Cargo.toml | 6 +++++- winit/src/application.rs | 19 +++++++++++-------- winit/src/lib.rs | 4 +++- 3 files changed, 19 insertions(+), 10 deletions(-) (limited to 'winit') diff --git a/winit/Cargo.toml b/winit/Cargo.toml index f5478e73..7758899c 100644 --- a/winit/Cargo.toml +++ b/winit/Cargo.toml @@ -12,12 +12,12 @@ categories = ["gui"] [features] debug = ["iced_native/debug"] +system = ["sysinfo"] [dependencies] window_clipboard = "0.2" log = "0.4" thiserror = "1.0" -sysinfo = "0.23" [dependencies.winit] version = "0.26" @@ -42,3 +42,7 @@ version = "0.3.6" [target.'cfg(target_arch = "wasm32")'.dependencies.web-sys] version = "0.3" features = ["Document", "Window"] + +[dependencies.sysinfo] +version = "0.23" +optional = true diff --git a/winit/src/application.rs b/winit/src/application.rs index 04dd55f1..1b7a4c8d 100644 --- a/winit/src/application.rs +++ b/winit/src/application.rs @@ -542,7 +542,7 @@ pub fn run_command( clipboard: &mut Clipboard, proxy: &mut winit::event_loop::EventLoopProxy, window: &winit::window::Window, - graphics_info: impl FnOnce() -> compositor::Information + Copy, + _graphics_info: impl FnOnce() -> compositor::Information + Copy, ) { use iced_native::command; use iced_native::system; @@ -580,15 +580,18 @@ pub fn run_command( } }, command::Action::System(action) => match action { - system::Action::QueryInformation(tag) => { - let information = - crate::system::information(graphics_info()); + system::Action::QueryInformation(_tag) => { + #[cfg(feature = "sysinfo")] + { + let information = + crate::system::information(_graphics_info()); - let message = tag(information); + let message = _tag(information); - proxy - .send_event(message) - .expect("Send message to event loop"); + proxy + .send_event(message) + .expect("Send message to event loop"); + } } }, } diff --git a/winit/src/lib.rs b/winit/src/lib.rs index 2b5bb2ff..4e5cb637 100644 --- a/winit/src/lib.rs +++ b/winit/src/lib.rs @@ -31,9 +31,11 @@ pub mod application; pub mod clipboard; pub mod conversion; pub mod settings; -pub mod system; pub mod window; +#[cfg(feature = "system")] +pub mod system; + mod error; mod mode; mod position; -- cgit