diff options
| author |  Bingus <shankern@protonmail.com> | 2023-03-13 13:23:45 -0700 |
|---|---|---|
| committer | Bingus <shankern@protonmail.com> | 2023-03-13 13:23:45 -0700 |
| commit | fa068b904a904c86195ebfaa4e953466426a27aa (patch) | |
| tree | 146034f9e333082ec4cf84aa41f9275616f30bb1 /winit | |
| parent | e36daa6f937abd7cb2071fd8852a3c12263944ea (diff) | |
| parent | 8f14b448d263a2cfd03a998b1d54c21e33d58980 (diff) | |
| download | iced-fa068b904a904c86195ebfaa4e953466426a27aa.tar.gz iced-fa068b904a904c86195ebfaa4e953466426a27aa.tar.bz2 iced-fa068b904a904c86195ebfaa4e953466426a27aa.zip | |
Merge remote-tracking branch 'origin/master' into feat/multi-window-support
Diffstat (limited to 'winit')
| -rw-r--r-- | winit/Cargo.toml | 2 | ||||
| -rw-r--r-- | winit/src/application.rs | 2 | ||||
| -rw-r--r-- | winit/src/system.rs | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/winit/Cargo.toml b/winit/Cargo.toml index 443d89be..7de69528 100644 --- a/winit/Cargo.toml +++ b/winit/Cargo.toml @@ -66,5 +66,5 @@ version = "0.3" features = ["Document", "Window"] [dependencies.sysinfo] -version = "0.23" +version = "0.28" optional = true diff --git a/winit/src/application.rs b/winit/src/application.rs index 1310ba1c..906da3c6 100644 --- a/winit/src/application.rs +++ b/winit/src/application.rs @@ -767,7 +767,7 @@ pub fn run_command<A, E>( window::Action::ChangeMode(mode) => { window.set_visible(conversion::visible(mode)); window.set_fullscreen(conversion::fullscreen( - window.primary_monitor(), + window.current_monitor(), mode, )); } diff --git a/winit/src/system.rs b/winit/src/system.rs index 619086b8..8d8b018c 100644 --- a/winit/src/system.rs +++ b/winit/src/system.rs @@ -16,11 +16,11 @@ pub fn fetch_information<Message>( pub(crate) fn information( graphics_info: compositor::Information, ) -> Information { - use sysinfo::{ProcessExt, ProcessorExt, System, SystemExt}; + use sysinfo::{CpuExt, ProcessExt, System, SystemExt}; let mut system = System::new_all(); system.refresh_all(); - let cpu = system.global_processor_info(); + let cpu = system.global_cpu_info(); let memory_used = sysinfo::get_current_pid() .and_then(|pid| system.process(pid).ok_or("Process not found")) |