diff options
| author |  Héctor Ramón Jiménez <hector0193@gmail.com> | 2023-03-07 07:24:34 +0100 |
|---|---|---|
| committer | Héctor Ramón Jiménez <hector0193@gmail.com> | 2023-03-07 07:24:34 +0100 |
| commit | aa4b5bb6b962b48715023e3ce567d1a18473bffa (patch) | |
| tree | 5dcb839dac56c81a9b9b618db86f67f3e72af9d3 /winit/src | |
| parent | d3900e067361c82fd857fc92b81284146140bc3b (diff) | |
| parent | df68cca0c9dda051ae979ccc2f5ca8d37c3e3cb5 (diff) | |
| download | iced-aa4b5bb6b962b48715023e3ce567d1a18473bffa.tar.gz iced-aa4b5bb6b962b48715023e3ce567d1a18473bffa.tar.bz2 iced-aa4b5bb6b962b48715023e3ce567d1a18473bffa.zip | |
Merge branch 'master' into feature/software-renderer
Diffstat (limited to 'winit/src')
| -rw-r--r-- | winit/src/application.rs | 2 | ||||
| -rw-r--r-- | winit/src/system.rs | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/winit/src/application.rs b/winit/src/application.rs index 9666fcae..48f94235 100644 --- a/winit/src/application.rs +++ b/winit/src/application.rs @@ -758,7 +758,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 069efa29..145a4d92 100644 --- a/winit/src/system.rs +++ b/winit/src/system.rs @@ -15,11 +15,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")) |