me/iced
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/master' into feat/multi-window-support

Browse source
This commit is contained in:
Bingus 2023-03-13 13:23:45 -07:00
commit fa068b904a
No known key found for this signature in database
GPG key ID: 5F84D2AA40A9F170
6 changed files with 25 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
winit/Cargo.toml
View file

@ -66,5 +66,5 @@ version = "0.3"
features = ["Document", "Window"]
[dependencies.sysinfo]
version = "0.23"
version = "0.28"
optional = true

2
winit/src/application.rs
View file

@ -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,
));
}

4
winit/src/system.rs
View file

@ -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"))