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

New short OS Version field; update doc strings

Browse source
This commit is contained in:
Clark Moody 2022-09-23 15:41:47 -05:00
parent 3c9af1eb31
commit 8d2331af01
2 changed files with 17 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

25
native/src/system/information.rs
View file

@ -1,22 +1,29 @@
/// Contains informations about the system (e.g. system name, processor, memory, graphics adapter). /// Contains informations about the system (e.g. system name, processor, memory, graphics adapter).
#[derive(Clone, Debug)] #[derive(Clone, Debug)]
pub struct Information { pub struct Information {
/// Contains the system name. /// The operating system name
pub system_name: Option<String>, pub system_name: Option<String>,
/// Contains the kernel version. /// Operating system kernel version
pub system_kernel: Option<String>, pub system_kernel: Option<String>,
/// Contains the systme version. /// Long operating system version
///
/// Examples:
/// - MacOS 10.15 Catalina
/// - Windows 10 Pro
/// - Ubuntu 20.04 LTS (Focal Fossa)
pub system_version: Option<String>, pub system_version: Option<String>,
/// Contains the processor brand. /// Short operating system version number
pub system_short_version: Option<String>,
/// Detailed processor model information
pub cpu_brand: String, pub cpu_brand: String,
/// Contains the number of physical cores on the processor. /// The number of physical cores on the processor
pub cpu_cores: Option<usize>, pub cpu_cores: Option<usize>,
/// Contains the total RAM size in KB. /// Total RAM size, KB
pub memory_total: u64, pub memory_total: u64,
/// Contains the system used RAM size in KB. /// Memory used by this process, KB
pub memory_used: Option<u64>, pub memory_used: Option<u64>,
/// Contains the graphics backend. /// Underlying graphics backend for rendering
pub graphics_backend: String, pub graphics_backend: String,
/// Contains the graphics adapter. /// Model information for the active graphics adapter
pub graphics_adapter: String, pub graphics_adapter: String,
} }

1
winit/src/system.rs
View file

@ -31,6 +31,7 @@ pub(crate) fn information(
system_name: system.name(), system_name: system.name(),
system_kernel: system.kernel_version(), system_kernel: system.kernel_version(),
system_version: system.long_os_version(), system_version: system.long_os_version(),
system_short_version: system.os_version(),
cpu_brand: cpu.brand().into(), cpu_brand: cpu.brand().into(),
cpu_cores: system.physical_core_count(), cpu_cores: system.physical_core_count(),
memory_total: system.total_memory(), memory_total: system.total_memory(),